diff options
| -rw-r--r-- | sound/soc/samsung/tobermory.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sound/soc/samsung/tobermory.c b/sound/soc/samsung/tobermory.c index 9c80506527c4..85ccfb7188cb 100644 --- a/sound/soc/samsung/tobermory.c +++ b/sound/soc/samsung/tobermory.c | |||
| @@ -179,15 +179,10 @@ static int tobermory_late_probe(struct snd_soc_card *card) | |||
| 179 | if (ret < 0) | 179 | if (ret < 0) |
| 180 | return ret; | 180 | return ret; |
| 181 | 181 | ||
| 182 | ret = snd_soc_jack_new(codec, "Headset", | 182 | ret = snd_soc_card_jack_new(card, "Headset", SND_JACK_HEADSET | |
| 183 | SND_JACK_HEADSET | SND_JACK_BTN_0, | 183 | SND_JACK_BTN_0, &tobermory_headset, |
| 184 | &tobermory_headset); | 184 | tobermory_headset_pins, |
| 185 | if (ret) | 185 | ARRAY_SIZE(tobermory_headset_pins)); |
| 186 | return ret; | ||
| 187 | |||
| 188 | ret = snd_soc_jack_add_pins(&tobermory_headset, | ||
| 189 | ARRAY_SIZE(tobermory_headset_pins), | ||
| 190 | tobermory_headset_pins); | ||
| 191 | if (ret) | 186 | if (ret) |
| 192 | return ret; | 187 | return ret; |
| 193 | 188 | ||
