| Message ID | 1437355925-20498-1-git-send-email-drinkcat@chromium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f136dce45116027fec65c342fbcb5aaa900729c6 |
| Headers | show |
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 3a6756d..9d54b34 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 */
"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> --- Mark, Thanks for replacing "ASoC: rt5645: Check if codec is initialized in workqueue handler" in fix/rt5645, that makes this a bit easier. This patch applies on top of broonie/sound.git/for-next, and should be applied in topic/rt5645, after merging fix/rt5645 into topic/rt5645. sound/soc/codecs/rt5645.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)