summaryrefslogtreecommitdiff
path: root/sound/firewire/oxfw
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-01 17:01:00 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-01 17:01:55 +0200
commitb5c21c84705dbd96a0fff930d33022a17910b4f4 (patch)
treea080aa4383c8f4ffb91225d234ac9b530b2ff0fa /sound/firewire/oxfw
parent7c2b3629d09ddec810dc4c1d3a6657c32def8f71 (diff)
parent7fbd1753b64eafe21cf842348a40a691d0dee440 (diff)
Merge branch 'for-linus' into for-next
This back-merge is necessary for adjusting the latest FireWire fix with the recent refactoring in 5.3 development branch. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/oxfw')
-rw-r--r--sound/firewire/oxfw/oxfw.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index 2de26a9987f8..11a4e1581381 100644
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -146,9 +146,6 @@ static int detect_quirks(struct snd_oxfw *oxfw)
oxfw->midi_input_ports = 0;
oxfw->midi_output_ports = 0;
- /* Output stream exists but no data channels are useful. */
- oxfw->has_output = false;
-
return snd_oxfw_scs1x_add(oxfw);
}