aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/musb/musb_host.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-06-27 14:26:54 +0100
committerMark Brown <broonie@kernel.org>2018-06-27 14:26:54 +0100
commit8900747f49c2a7f38239abe710de4a1d1d275591 (patch)
tree85e6c71602e59d3651221fde54fd32b292569809 /drivers/usb/musb/musb_host.c
parent14c74ac318a8fe6dd6e13ddc93a5b458147a7c4c (diff)
parentc806e0856941597f058b4a527d77dbc0000c513c (diff)
Merge tag 'v4.9.110' into linux-linaro-lsk-v4.9lsk-v4.9-18.06
This is the 4.9.110 stable release
Diffstat (limited to 'drivers/usb/musb/musb_host.c')
-rw-r--r--drivers/usb/musb/musb_host.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index e2bc91585b4f..19b5f08cb423 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -2554,8 +2554,11 @@ static int musb_bus_suspend(struct usb_hcd *hcd)
{
struct musb *musb = hcd_to_musb(hcd);
u8 devctl;
+ int ret;
- musb_port_suspend(musb, true);
+ ret = musb_port_suspend(musb, true);
+ if (ret)
+ return ret;
if (!is_host_active(musb))
return 0;