aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2013-03-20 02:01:53 -0400
committerFelipe Balbi <balbi@ti.com>2013-03-20 02:01:53 -0400
commite8d891fb7b8fe4ee7311820594323d46dbc31d45 (patch)
tree8419b7cc1b26181fb63ca7fcc39d0614c368b2f0
parentb64a15930c35c3c1046533aadcfe4f3233e70c20 (diff)
usb: phy: gpio-vbus: don't ignore regulator APIs return value
Due to recent changes to regulator API, all users which don't check regulator_{en,dis}able()'s return value will generate compile warnings. Add such checks to gpio-vbus. Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/phy/phy-gpio-vbus-usb.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/usb/phy/phy-gpio-vbus-usb.c b/drivers/usb/phy/phy-gpio-vbus-usb.c
index a7d4ac591982..4c76074e518d 100644
--- a/drivers/usb/phy/phy-gpio-vbus-usb.c
+++ b/drivers/usb/phy/phy-gpio-vbus-usb.c
@@ -61,6 +61,7 @@ static void set_vbus_draw(struct gpio_vbus_data *gpio_vbus, unsigned mA)
61{ 61{
62 struct regulator *vbus_draw = gpio_vbus->vbus_draw; 62 struct regulator *vbus_draw = gpio_vbus->vbus_draw;
63 int enabled; 63 int enabled;
64 int ret;
64 65
65 if (!vbus_draw) 66 if (!vbus_draw)
66 return; 67 return;
@@ -69,12 +70,16 @@ static void set_vbus_draw(struct gpio_vbus_data *gpio_vbus, unsigned mA)
69 if (mA) { 70 if (mA) {
70 regulator_set_current_limit(vbus_draw, 0, 1000 * mA); 71 regulator_set_current_limit(vbus_draw, 0, 1000 * mA);
71 if (!enabled) { 72 if (!enabled) {
72 regulator_enable(vbus_draw); 73 ret = regulator_enable(vbus_draw);
74 if (ret < 0)
75 return;
73 gpio_vbus->vbus_draw_enabled = 1; 76 gpio_vbus->vbus_draw_enabled = 1;
74 } 77 }
75 } else { 78 } else {
76 if (enabled) { 79 if (enabled) {
77 regulator_disable(vbus_draw); 80 ret = regulator_disable(vbus_draw);
81 if (ret < 0)
82 return;
78 gpio_vbus->vbus_draw_enabled = 0; 83 gpio_vbus->vbus_draw_enabled = 0;
79 } 84 }
80 } 85 }