diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-08-04 13:42:58 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-08-04 13:42:58 +0200 |
commit | 5d503ffc70e3983202550a8f4b5a4de42246767a (patch) | |
tree | 6b57b2ca71191674d42094f675a8e46b9e545bec /sound/pci | |
parent | c0766c56058096b1b985acd2d47bfb66ea72250b (diff) | |
parent | 16ffe32c773dab387cfc5e6bdf181367ff944376 (diff) |
Merge branch 'topic/hda' into for-next
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 8ec6a906c5fd..433190b6e0ca 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -4813,10 +4813,8 @@ static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res) switch (event->type) { case STAC_HP_EVENT: - stac92xx_hp_detect(codec); - break; case STAC_LO_EVENT: - stac92xx_line_out_detect(codec, 0); + stac92xx_hp_detect(codec); break; case STAC_MIC_EVENT: stac92xx_mic_detect(codec); |