From: Jianhong Chen <chenjh@rock-chips.com>
Date: Wed, 19 Oct 2016 08:38:13 +0000 (+0800)
Subject: power: rk818-charger: fix usb_charger not assigned new state error
X-Git-Tag: firefly_0821_release~1379
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=9dbc8d5aaa5b1cf119802f8fc9b246a7a303347f

power: rk818-charger: fix usb_charger not assigned new state error

Change-Id: I841fe6106fb51820d541cd99a21d0ad0305dec9d
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
---

diff --git a/drivers/power/rk818_charger.c b/drivers/power/rk818_charger.c
index aeff14f20498..f8717e77ddfb 100644
--- a/drivers/power/rk818_charger.c
+++ b/drivers/power/rk818_charger.c
@@ -966,6 +966,7 @@ static void rk818_cg_charger_evt_worker(struct work_struct *work)
 	if (charger != USB_TYPE_UNKNOWN_CHARGER) {
 		CG_INFO("receive type-c notifier event: %s...\n",
 			event[charger]);
+		cg->usb_charger = charger;
 		rk818_cg_set_chrg_param(cg, charger);
 		rk818_cg_pr_info(cg);
 	}
@@ -1061,6 +1062,7 @@ static long rk818_cg_init_usb(struct rk818_charger *cg)
 		cg->cable_edev = edev;
 
 		schedule_delayed_work(&cg->host_work, 0);
+		schedule_delayed_work(&cg->usb_work, 0);
 
 		CG_INFO("register typec extcon evt notifier\n");
 	} else {