]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ALSA: hda - Cirrus: Correctly clear line_out_pins when moving to speaker
authorDavid Henningsson <david.henningsson@canonical.com>
Wed, 21 Nov 2012 09:03:10 +0000 (10:03 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 21 Nov 2012 09:09:02 +0000 (10:09 +0100)
If this array is not cleared, the jack related code later might
fail to create "Internal Speaker Phantom Jack" on Dell Inspiron 3420 and
Dell Vostro 2420.

BugLink: https://bugs.launchpad.net/bugs/1076840
Cc: stable@vger.kernel.org (3.6+)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_cirrus.c

index d5f3a26d608db72f1e4ef3f596392eb5a4f25a67..3bcb671723583ed852ec97aa844d2736ffd4b330 100644 (file)
@@ -466,6 +466,7 @@ static int parse_output(struct hda_codec *codec)
                memcpy(cfg->speaker_pins, cfg->line_out_pins,
                       sizeof(cfg->speaker_pins));
                cfg->line_outs = 0;
+               memset(cfg->line_out_pins, 0, sizeof(cfg->line_out_pins));
        }
 
        return 0;