Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[sfrench/cifs-2.6.git] / sound / pci / emu10k1 / emu10k1_synth.c

diff --git a/sound/pci/emu10k1/emu10k1_synth.c b/sound/pci/emu10k1/emu10k1_synth.c
index 1fa393f22a998fa48cfeea9a785a6d55ea9dc75a..204995a1dfbd15e311f0dbce1360b7529b4a5f95 100644 (file)
--- a/sound/pci/emu10k1/emu10k1_synth.c
+++ b/sound/pci/emu10k1/emu10k1_synth.c
@@ -62,7 +62,6 @@ static int snd_emu10k1_synth_new_device(struct snd_seq_device *dev)
 
        if (snd_emux_register(emu, dev->card, arg->index, "Emu10k1") < 0) {
                snd_emux_free(emu);
-               emu->hw = NULL;
                return -ENOMEM;
        }