diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-22 00:17:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-22 00:17:27 +0100 |
| commit | bfbc344732badffe94f096f929e4a105b3b92d1f (patch) | |
| tree | f4fc6c06108495bd2c33ecff68c065514e66a8cc /drivers/usb/host/ehci-platform.c | |
| parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) | |
| parent | c6466950e917890be3050171f6745ccb9d91d35f (diff) | |
Merge tag 'mfd-regulator-v3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-bcm590xxx
Immutable branch between MFD and Regulator due for v3.16 merge-window.
Diffstat (limited to 'drivers/usb/host/ehci-platform.c')
| -rw-r--r-- | drivers/usb/host/ehci-platform.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c index b3a0e11073aa..c7dd93aad20c 100644 --- a/drivers/usb/host/ehci-platform.c +++ b/drivers/usb/host/ehci-platform.c @@ -303,6 +303,8 @@ static int ehci_platform_suspend(struct device *dev) int ret; ret = ehci_suspend(hcd, do_wakeup); + if (ret) + return ret; if (pdata->power_suspend) pdata->power_suspend(pdev); |