]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: aw2: do not grab every saa7146 based device
authorAnssi Hannula <anssi.hannula@gmail.com>
Sun, 22 Feb 2009 12:42:54 +0000 (14:42 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Feb 2009 06:41:25 +0000 (07:41 +0100)
Audiowerk2 driver snd-aw2 is bound to any saa7146 device as it does not
check subsystem ids. Many DVB devices are saa7146 based, so aw2 driver
grabs them as well.

According to http://lkml.org/lkml/2008/10/15/311 aw2 devices have the
subsystem ids set to 0, the saa7146 default.

Fix conflicts with DVB devices by checking for subsystem ids = 0
specifically.

Signed-off-by: Anssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/aw2/aw2-alsa.c

index 3f00ddf450f81c287b198cdbdf4c8a17b180c4f8..c7c54e7748e9ac6fdbf09f1d4bb11f7106d1bfc3 100644 (file)
@@ -165,7 +165,7 @@ module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable Audiowerk2 soundcard.");
 
 static struct pci_device_id snd_aw2_ids[] = {
-       {PCI_VENDOR_ID_SAA7146, PCI_DEVICE_ID_SAA7146, PCI_ANY_ID, PCI_ANY_ID,
+       {PCI_VENDOR_ID_SAA7146, PCI_DEVICE_ID_SAA7146, 0, 0,
         0, 0, 0},
        {0}
 };