X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=blobdiff_plain;f=drivers%2Fusb%2Fdwc_otg_310%2Fusbdev_rk32.c;h=5f383907261598e301d6655f53938fa8f8b6bffc;hp=53e14def84d487fc956f7bc03b8f964d1d62f831;hb=9a47b6de548a83d198e2a92b53fe735c62832515;hpb=b4e7e31d6a73b8a93e73bb409d495171c4cc09f1

diff --git a/drivers/usb/dwc_otg_310/usbdev_rk32.c b/drivers/usb/dwc_otg_310/usbdev_rk32.c
index 53e14def84d4..5f3839072615 100644
--- a/drivers/usb/dwc_otg_310/usbdev_rk32.c
+++ b/drivers/usb/dwc_otg_310/usbdev_rk32.c
@@ -183,13 +183,14 @@ static void usb20otg_power_enable(int enable)
 		/* disable otg_drv power */
 		if (gpio_is_valid(control_usb->otg_gpios->gpio))
 			gpio_set_value(control_usb->otg_gpios->gpio, 0);
-		else if (usb20otg_get_status(USB_STATUS_BVABLID))
-			rk_battery_charger_detect_cb(USB_OTG_POWER_OFF);
+
+		rk_battery_charger_detect_cb(USB_OTG_POWER_OFF);
 	} else if (1 == enable) {
 		/* enable otg_drv power */
 		if (gpio_is_valid(control_usb->otg_gpios->gpio))
 			gpio_set_value(control_usb->otg_gpios->gpio, 1);
-		else if (!usb20otg_get_status(USB_STATUS_BVABLID))
+
+		if (!usb20otg_get_status(USB_STATUS_BVABLID))
 			rk_battery_charger_detect_cb(USB_OTG_POWER_ON);
 	}
 }