From: chenjh Date: Mon, 24 Apr 2017 02:26:25 +0000 (+0800) Subject: power: rk818-charger: fix cancel delayed work error because of not initialize X-Git-Tag: release-20171130_firefly~4^2~751 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=be4b15c304b622971f7dcad1584fd31e28c95eeb;p=firefly-linux-kernel-4.4.55.git power: rk818-charger: fix cancel delayed work error because of not initialize Change-Id: I2273c55f2ffbc5d09cf80bbfdf3030acada39eab Signed-off-by: chenjh --- diff --git a/drivers/power/rk818_charger.c b/drivers/power/rk818_charger.c index 538952e61d54..c38d4828f4b5 100644 --- a/drivers/power/rk818_charger.c +++ b/drivers/power/rk818_charger.c @@ -1283,9 +1283,13 @@ static void rk818_charger_shutdown(struct platform_device *pdev) { struct rk818_charger *cg = platform_get_drvdata(pdev); - cancel_delayed_work_sync(&cg->host_work); + /* type-c only */ + if (cg->pdata->extcon) { + cancel_delayed_work_sync(&cg->host_work); + cancel_delayed_work_sync(&cg->discnt_work); + } + cancel_delayed_work_sync(&cg->usb_work); - cancel_delayed_work_sync(&cg->discnt_work); cancel_delayed_work_sync(&cg->dc_work); cancel_delayed_work_sync(&cg->finish_sig_work); cancel_delayed_work_sync(&cg->irq_work);