Merge branch 'for-linus' into for-next

[linux-2.6-block.git] / sound / firewire / oxfw / oxfw.c

diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index 2de26a9987f876a48bc5d9534373dfea1249486d..11a4e1581381a16ea82a4b9786eacee10416374a 100644 (file)
--- 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);
        }