diff options
author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-04-09 11:56:09 +0200 |
---|---|---|
committer | Chanwoo Choi <cw00.choi@samsung.com> | 2014-04-24 17:26:30 +0900 |
commit | 12adef5b49e98eb181b4163c36e2998169e1379b (patch) | |
tree | 652b0d8d2d397dda7c3f0ed773975bdcfc696313 /drivers/extcon | |
parent | a55d952a2b732e8aaa218a0507935a1deb0c8eea (diff) | |
download | op-kernel-dev-12adef5b49e98eb181b4163c36e2998169e1379b.zip op-kernel-dev-12adef5b49e98eb181b4163c36e2998169e1379b.tar.gz |
extcon: max14577: Fix probe failure on successful work queue
In probe the driver queued delayed work for cable detection and
returned the result of queue_delayed_work() call. However the return
value of queue_delayed_work() does not indicate an error and in normal
condition it returns true which means successful work queue.
This effectively resulted in probe failure:
[ 2.088204] max14577-muic: probe of max77836-muic failed with error 1
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: <stable@vger.kernel.org>
Fixes: 962e56bfcf0b ("extcon: max14577: Add extcon-max14577 driver...")
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Diffstat (limited to 'drivers/extcon')
-rw-r--r-- | drivers/extcon/extcon-max14577.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c index c76734a..4179ce1 100644 --- a/drivers/extcon/extcon-max14577.c +++ b/drivers/extcon/extcon-max14577.c @@ -782,13 +782,8 @@ static int max14577_muic_probe(struct platform_device *pdev) * driver should notify cable state to upper layer. */ INIT_DELAYED_WORK(&info->wq_detcable, max14577_muic_detect_cable_wq); - ret = queue_delayed_work(system_power_efficient_wq, &info->wq_detcable, + queue_delayed_work(system_power_efficient_wq, &info->wq_detcable, delay_jiffies); - if (ret < 0) { - dev_err(&pdev->dev, - "failed to schedule delayed work for cable detect\n"); - goto err_extcon; - } return ret; |