summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/rt5645.c
diff options
context:
space:
mode:
authorNicolas Boichat <drinkcat@chromium.org>2015-07-20 03:32:05 +0200
committerMark Brown <broonie@kernel.org>2015-07-20 19:14:15 +0200
commitf136dce45116027fec65c342fbcb5aaa900729c6 (patch)
treea95a17eee6841368c11f91dbb7f1d1e281adbb16 /sound/soc/codecs/rt5645.c
parentMerge branch 'fix/rt5645' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff)
downloadlinux-f136dce45116027fec65c342fbcb5aaa900729c6.tar.xz
linux-f136dce45116027fec65c342fbcb5aaa900729c6.zip
ASoC: rt5645: Remove return value in jack detect work
"ASoC: rt5645: Check if codec is initialized in workqueue handler" adds a check if codec is NULL in rt5645_irq_detection, which returns an int. However, "ASoC: rt5645: Remove irq_jack_detection function" removes that function, and moves the code in jack_detect_work, which returns void. Remove the return value to fix compilation warning. Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/rt5645.c')
-rw-r--r--sound/soc/codecs/rt5645.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index 19392b13bd5b..2ee42781cc52 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -2928,7 +2928,7 @@ static void rt5645_jack_detect_work(struct work_struct *work)
int val, btn_type, gpio_state = 0, report = 0;
if (!rt5645->codec)
- return -EINVAL;
+ return;
switch (rt5645->pdata.jd_mode) {
case 0: /* Not using rt5645 JD */