diff options
| author | Anssi Hannula <anssi.hannula@gmail.com> | 2009-02-22 14:42:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-16 17:52:49 -0700 |
| commit | 2b5934e976dc1be635c76af82e994fe62252394b (patch) | |
| tree | ec2e19ee0bfdf0fd13c0ef95d5d5e3255676b40d /sound | |
| parent | 2e7db0feff88e28ca6fbdadf46ab4ae061ff59b8 (diff) | |
| download | lwn-2b5934e976dc1be635c76af82e994fe62252394b.tar.gz lwn-2b5934e976dc1be635c76af82e994fe62252394b.zip | |
ALSA: aw2: do not grab every saa7146 based device
commit e8bf069c419c1dc0657e02636441fe1179a9db14 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/aw2/aw2-alsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c index 3f00ddf450f8..c7c54e7748e9 100644 --- a/sound/pci/aw2/aw2-alsa.c +++ b/sound/pci/aw2/aw2-alsa.c @@ -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} }; |