diff options
Diffstat (limited to 'sound/pci/hda/hda_jack.c')
-rw-r--r-- | sound/pci/hda/hda_jack.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c index 9746d73cec52..9c8f24f2d56b 100644 --- a/sound/pci/hda/hda_jack.c +++ b/sound/pci/hda/hda_jack.c | |||
@@ -217,7 +217,6 @@ EXPORT_SYMBOL_GPL(snd_hda_jack_detect_state); | |||
217 | * snd_hda_jack_detect_enable - enable the jack-detection | 217 | * snd_hda_jack_detect_enable - enable the jack-detection |
218 | */ | 218 | */ |
219 | int snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid, | 219 | int snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid, |
220 | unsigned char action, | ||
221 | hda_jack_callback cb) | 220 | hda_jack_callback cb) |
222 | { | 221 | { |
223 | struct hda_jack_tbl *jack = snd_hda_jack_tbl_new(codec, nid); | 222 | struct hda_jack_tbl *jack = snd_hda_jack_tbl_new(codec, nid); |
@@ -226,8 +225,6 @@ int snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid, | |||
226 | if (jack->jack_detect) | 225 | if (jack->jack_detect) |
227 | return 0; /* already registered */ | 226 | return 0; /* already registered */ |
228 | jack->jack_detect = 1; | 227 | jack->jack_detect = 1; |
229 | if (action) | ||
230 | jack->action = action; | ||
231 | if (cb) | 228 | if (cb) |
232 | jack->callback = cb; | 229 | jack->callback = cb; |
233 | if (codec->jackpoll_interval > 0) | 230 | if (codec->jackpoll_interval > 0) |
@@ -238,10 +235,9 @@ int snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid, | |||
238 | } | 235 | } |
239 | EXPORT_SYMBOL_GPL(snd_hda_jack_detect_enable_callback); | 236 | EXPORT_SYMBOL_GPL(snd_hda_jack_detect_enable_callback); |
240 | 237 | ||
241 | int snd_hda_jack_detect_enable(struct hda_codec *codec, hda_nid_t nid, | 238 | int snd_hda_jack_detect_enable(struct hda_codec *codec, hda_nid_t nid) |
242 | unsigned char action) | ||
243 | { | 239 | { |
244 | return snd_hda_jack_detect_enable_callback(codec, nid, action, NULL); | 240 | return snd_hda_jack_detect_enable_callback(codec, nid, NULL); |
245 | } | 241 | } |
246 | EXPORT_SYMBOL_GPL(snd_hda_jack_detect_enable); | 242 | EXPORT_SYMBOL_GPL(snd_hda_jack_detect_enable); |
247 | 243 | ||
@@ -431,7 +427,7 @@ static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid, | |||
431 | return err; | 427 | return err; |
432 | 428 | ||
433 | if (!phantom_jack) | 429 | if (!phantom_jack) |
434 | return snd_hda_jack_detect_enable(codec, nid, 0); | 430 | return snd_hda_jack_detect_enable(codec, nid); |
435 | return 0; | 431 | return 0; |
436 | } | 432 | } |
437 | 433 | ||