projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6ba43c2
)
phy-sun4i-usb: Warn when external vbus is detected
author
Hans de Goede
<hdegoede@redhat.com>
Wed, 7 Sep 2016 20:20:41 +0000
(22:20 +0200)
committer
Kishon Vijay Abraham I
<kishon@ti.com>
Sat, 10 Sep 2016 11:45:19 +0000
(17:15 +0530)
Warn when external vbus is detected when we're trying to enable our
own vbus.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
drivers/phy/phy-sun4i-usb.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/phy/phy-sun4i-usb.c
b/drivers/phy/phy-sun4i-usb.c
index af42f8d40ac10f483c55bad6556769c1deb9c8ed..03f030b491d609823c21b50f6ed9d814f26acd33 100644
(file)
--- a/
drivers/phy/phy-sun4i-usb.c
+++ b/
drivers/phy/phy-sun4i-usb.c
@@
-390,8
+390,10
@@
static int sun4i_usb_phy_power_on(struct phy *_phy)
/* For phy0 only turn on Vbus if we don't have an ext. Vbus */
if (phy->index == 0 && sun4i_usb_phy0_have_vbus_det(data) &&
- data->vbus_det)
+ data->vbus_det) {
+ dev_warn(&_phy->dev, "External vbus detected, not enabling our own vbus\n");
return 0;
+ }
ret = regulator_enable(phy->vbus);
if (ret)