From: lyz <lyz@rock-chips.com>
Date: Fri, 12 Jun 2015 12:38:26 +0000 (+0800)
Subject: usb: bc: fix crush caused by usb bc detect
X-Git-Tag: firefly_0821_release~4044
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3e8ae7c50f3878cf40af58215ec6eb3901549211;p=firefly-linux-kernel-4.4.55.git

usb: bc: fix crush caused by usb bc detect

Fix a bug that mutex used before init.

Signed-off-by: lyz <lyz@rock-chips.com>
---

diff --git a/drivers/usb/dwc_otg_310/usbdev_bc.c b/drivers/usb/dwc_otg_310/usbdev_bc.c
index 3d99f8fbd052..612672fba515 100755
--- a/drivers/usb/dwc_otg_310/usbdev_bc.c
+++ b/drivers/usb/dwc_otg_310/usbdev_bc.c
@@ -29,7 +29,7 @@ char *bc_string[USB_BC_TYPE_MAX] = {"DISCONNECT",
 uoc_field_t *pBC_UOC_FIELDS;
 static void *pGRF_BASE;
 static void *pGRF_REGMAP;
-static struct mutex bc_mutex;
+DEFINE_MUTEX(bc_mutex);
 
 static enum bc_port_type usb_charger_status = USB_BC_TYPE_DISCNT;
 
@@ -389,7 +389,6 @@ enum bc_port_type usb_battery_charger_detect(bool wait)
 	if (!pGRF_BASE && !pGRF_REGMAP) {
 		pGRF_BASE = get_grf_base(np);
 		pGRF_REGMAP = get_grf_regmap(np);
-		mutex_init(&bc_mutex);
 	}
 
 	mutex_lock(&bc_mutex);