summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-11-27 23:35:16 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-12-03 20:07:56 +0100
commitdf722f36395ec239ec1709d3323c8576c148ca8b (patch)
treea192e314bd7fcb6086d42de9509668db19fb6258 /drivers/usb
parent6e92d42d483f212072b96750d7b199f84d6aa2e7 (diff)
downloadbarebox-df722f36395ec239ec1709d3323c8576c148ca8b.tar.gz
barebox-df722f36395ec239ec1709d3323c8576c148ca8b.tar.xz
USB ulpi: pass return value
Pass the return value from ulpi_probe in ulpi_setup instead of returning -1 (which is -EPERM and does not make sense in this context) Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/otg/ulpi.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/otg/ulpi.c b/drivers/usb/otg/ulpi.c
index d749280193..61cbadaf2d 100644
--- a/drivers/usb/otg/ulpi.c
+++ b/drivers/usb/otg/ulpi.c
@@ -181,8 +181,11 @@ int ulpi_set_vbus(void __iomem *view, int on)
int ulpi_setup(void __iomem *view, int on)
{
- if (ulpi_probe(view))
- return -1;
+ int ret;
+
+ ret = ulpi_probe(view);
+ if (ret)
+ return ret;
return ulpi_set_vbus(view, on);
}