ALSA: hda - Fix no NID error with VIA codecs
authorTakashi Iwai <tiwai@suse.de>
Fri, 17 Jun 2011 12:23:46 +0000 (14:23 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 17 Jun 2011 12:23:46 +0000 (14:23 +0200)
The via driver spews warnigs like
hda-codec: no NID for mapping control Independent HP:0:0
with some codecs because snd_hda_add_nid() is called with nid=0.
This patch fixes it by skipping the call when no corresponding widget
is found.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_via.c

index 605c99e1e520de5d205a76046764d7e5f0f5a852..c952582fb21810933fc9891b687f516d84cf881e 100644 (file)
@@ -832,10 +832,13 @@ static int via_hp_build(struct hda_codec *codec)
        knew->subdevice = HDA_SUBDEV_NID_FLAG | nid;
        knew->private_value = nid;
 
-       knew = via_clone_control(spec, &via_hp_mixer[1]);
-       if (knew == NULL)
-               return -ENOMEM;
-       knew->subdevice = side_mute_channel(spec);
+       nid = side_mute_channel(spec);
+       if (nid) {
+               knew = via_clone_control(spec, &via_hp_mixer[1]);
+               if (knew == NULL)
+                       return -ENOMEM;
+               knew->subdevice = nid;
+       }
 
        return 0;
 }