]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: hda - Power up always when no jack detection is available
authorTakashi Iwai <tiwai@suse.de>
Fri, 19 Dec 2008 15:39:48 +0000 (16:39 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 19 Dec 2008 15:41:06 +0000 (16:41 +0100)
When no jack detection is available, the pins should be always
turned on since it can't be turned on/off dynamically via unsol
events.

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

index d9a89ced3c89e5327fb5d74a695a81d7040aca45..2cadf7c3b71bb1dad8c9d4ffc0e5c86975651bce 100644 (file)
@@ -3946,7 +3946,13 @@ static int stac92xx_init(struct hda_codec *codec)
                hda_nid_t nid = spec->pwr_nids[i];
                int pinctl, def_conf;
 
-               if (is_nid_hp_pin(cfg, nid) && spec->hp_detect)
+               /* power on when no jack detection is available */
+               if (!spec->hp_detect) {
+                       stac_toggle_power_map(codec, nid, 1);
+                       continue;
+               }
+
+               if (is_nid_hp_pin(cfg, nid))
                        continue; /* already has an unsol event */
 
                pinctl = snd_hda_codec_read(codec, nid, 0,
@@ -3955,8 +3961,10 @@ static int stac92xx_init(struct hda_codec *codec)
                 * any attempts on powering down a input port cause the
                 * referenced VREF to act quirky.
                 */
-               if (pinctl & AC_PINCTL_IN_EN)
+               if (pinctl & AC_PINCTL_IN_EN) {
+                       stac_toggle_power_map(codec, nid, 1);
                        continue;
+               }
                def_conf = snd_hda_codec_read(codec, nid, 0,
                                              AC_VERB_GET_CONFIG_DEFAULT, 0);
                def_conf = get_defcfg_connect(def_conf);