summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-09-28 20:12:08 +0200
committerTakashi Iwai <tiwai@suse.de>2011-09-28 20:19:16 +0200
commitef940b0403d4ae133c548b01fe64c74fa8a2f0b1 (patch)
treeba205acaabbabe84f5f00a081443a163b7bec878 /sound/pci
parent27fe48d97291e61e76e87c34c9b89032e70d05c0 (diff)
downloadlinux-3.10-ef940b0403d4ae133c548b01fe64c74fa8a2f0b1.tar.gz
linux-3.10-ef940b0403d4ae133c548b01fe64c74fa8a2f0b1.tar.bz2
linux-3.10-ef940b0403d4ae133c548b01fe64c74fa8a2f0b1.zip
ALSA: hda - Allow patching with any vendor/subsystem ids
In the ugly real world, there area really broken devices that don't set codec SSID correctly. In such a case, the ID can be random, thus the patching won't work reliably. For applying the patch forcibly to such a device, the driver will skip the vendor and/or subsystem ID checks when zero or a negative number is given in [codec] section. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/hda_hwdep.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index bf3ced51e0f..72e5885007c 100644
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -643,14 +643,14 @@ static inline int strmatch(const char *a, const char *b)
static void parse_codec_mode(char *buf, struct hda_bus *bus,
struct hda_codec **codecp)
{
- unsigned int vendorid, subid, caddr;
+ int vendorid, subid, caddr;
struct hda_codec *codec;
*codecp = NULL;
if (sscanf(buf, "%i %i %i", &vendorid, &subid, &caddr) == 3) {
list_for_each_entry(codec, &bus->codec_list, list) {
- if (codec->vendor_id == vendorid &&
- codec->subsystem_id == subid &&
+ if ((vendorid <= 0 || codec->vendor_id == vendorid) &&
+ (subid <= 0 || codec->subsystem_id == subid) &&
codec->addr == caddr) {
*codecp = codec;
break;