---

yaml --- r: 270596 b: refs/heads/master c: 45cf367 h: refs/heads/master v: v3
git-mirror · Sep 19, 2011 · 27e2ab9 · 27e2ab9
1 parent 4a389a2
commit 27e2ab9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b684cc14a791accdd6d97cb68242ab5009ece3e
+refs/heads/master: 45cf367e8058ff3f1f6f9c3e9f617bfd7cff65b1
diff --git a/trunk/sound/soc/samsung/speyside.c b/trunk/sound/soc/samsung/speyside.c
@@ -167,7 +167,8 @@ static int speyside_wm8996_init(struct snd_soc_pcm_runtime *rtd)
 	gpio_direction_output(WM8996_HPSEL_GPIO, speyside_jack_polarity);
 
 	ret = snd_soc_jack_new(codec, "Headset",
-			       SND_JACK_HEADSET | SND_JACK_BTN_0,
+			       SND_JACK_LINEOUT | SND_JACK_HEADSET |
+			       SND_JACK_BTN_0,
 			       &speyside_headset);
 	if (ret)
 		return ret;