From: Charles Keepax Date: Mon, 9 Dec 2019 11:09:13 +0000 (+0000) Subject: extcon: arizona: Remove excessive WARN_ON X-Git-Tag: v5.6-rc1~136^2~8^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8267ebcc46176d90b7b169440ebbc890e09a5010;p=thirdparty%2Fkernel%2Flinux.git extcon: arizona: Remove excessive WARN_ON A WARN_ON is very strong for simply finding a button that is out of range, downgrade this to a simple error message in the log. Signed-off-by: Charles Keepax Signed-off-by: Chanwoo Choi --- diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c index e7c198e798e27..3f7ced35e0b86 100644 --- a/drivers/extcon/extcon-arizona.c +++ b/drivers/extcon/extcon-arizona.c @@ -960,14 +960,13 @@ static void arizona_micd_detect(struct work_struct *work) input_report_key(info->input, info->micd_ranges[i].key, 0); - WARN_ON(!lvl); - WARN_ON(ffs(lvl) - 1 >= info->num_micd_ranges); if (lvl && ffs(lvl) - 1 < info->num_micd_ranges) { key = info->micd_ranges[ffs(lvl) - 1].key; input_report_key(info->input, key, 1); input_sync(info->input); + } else { + dev_err(arizona->dev, "Button out of range\n"); } - } else if (info->detecting) { dev_dbg(arizona->dev, "Headphone detected\n"); info->detecting = false;