aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-04-14 14:33:57 +0200
committerTakashi Iwai <tiwai@suse.de>2010-04-14 14:35:11 +0200
commitb331439dfd41dc813b3557ca5927a3a644f35792 (patch)
tree0a5ffe68fe93b4dec529074f6a700debccf3ba2b /sound
parentff818c24c2af370153646d302d831b69b023816f (diff)
downloadkernel_samsung_crespo-b331439dfd41dc813b3557ca5927a3a644f35792.zip
kernel_samsung_crespo-b331439dfd41dc813b3557ca5927a3a644f35792.tar.gz
kernel_samsung_crespo-b331439dfd41dc813b3557ca5927a3a644f35792.tar.bz2
ALSA: hda - Fix control element allocations in VIA codec parser
The commit 5b0cb1d850c26893b1468b3a519433a1b7a176be ALSA: hda - add more NID->Control mapping breaks the control element allocation by returning a wrong value. Let's fix it. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_via.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 9ddc373..be12954 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -476,7 +476,7 @@ static struct snd_kcontrol_new *via_clone_control(struct via_spec *spec,
knew->name = kstrdup(tmpl->name, GFP_KERNEL);
if (!knew->name)
return NULL;
- return 0;
+ return knew;
}
static void via_free_kctls(struct hda_codec *codec)