diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2014-09-11 14:39:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-09-15 11:50:48 +0200 |
| commit | bda17b82bfa9601f167ec338755b0b96909db5a0 (patch) | |
| tree | 54b53015593eb1665c89855da780130c2096e12d /sound/pci/hda/hda_jack.h | |
| parent | ALSA: hda - Make snd_hda_jack_tbl_new() static (diff) | |
| download | linux-dev-bda17b82bfa9601f167ec338755b0b96909db5a0.tar.xz linux-dev-bda17b82bfa9601f167ec338755b0b96909db5a0.zip | |
ALSA: hda - Make snd_hda_jack_detect_enable_callback() returning the jack object
STAC/IDT driver calls snd_hda_jack_tbl_get() again after calling
snd_hda_jack_detect_enable_callback(). For simplifying this, let's
make snd_hda_jack_detect_enable_callback() returning the pointer while
handling the error with the standard IS_ERR() & co.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_jack.h')
| -rw-r--r-- | sound/pci/hda/hda_jack.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_jack.h b/sound/pci/hda/hda_jack.h index 67f42db9c89c..668669ce3e52 100644 --- a/sound/pci/hda/hda_jack.h +++ b/sound/pci/hda/hda_jack.h @@ -47,8 +47,9 @@ void snd_hda_jack_tbl_clear(struct hda_codec *codec); void snd_hda_jack_set_dirty_all(struct hda_codec *codec); int snd_hda_jack_detect_enable(struct hda_codec *codec, hda_nid_t nid); -int snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid, - hda_jack_callback cb); +struct hda_jack_tbl * +snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid, + hda_jack_callback cb); int snd_hda_jack_set_gating_jack(struct hda_codec *codec, hda_nid_t gated_nid, hda_nid_t gating_nid); |