Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[~andy/linux] / drivers / usb / phy / phy-mxs-usb.c

diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 545844b7e7962f809f33812d9167f039b5fbc8d1..b42897b6474c3347f11d2daebedf648a91bbd49a 100644 (file)
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -63,9 +63,13 @@ static int mxs_phy_hw_init(struct mxs_phy *mxs_phy)
 
 static int mxs_phy_init(struct usb_phy *phy)
 {
+       int ret;
        struct mxs_phy *mxs_phy = to_mxs_phy(phy);
 
-       clk_prepare_enable(mxs_phy->clk);
+       ret = clk_prepare_enable(mxs_phy->clk);
+       if (ret)
+               return ret;
+
        return mxs_phy_hw_init(mxs_phy);
 }
 
@@ -81,6 +85,7 @@ static void mxs_phy_shutdown(struct usb_phy *phy)
 
 static int mxs_phy_suspend(struct usb_phy *x, int suspend)
 {
+       int ret;
        struct mxs_phy *mxs_phy = to_mxs_phy(x);
 
        if (suspend) {
@@ -89,7 +94,9 @@ static int mxs_phy_suspend(struct usb_phy *x, int suspend)
                       x->io_priv + HW_USBPHY_CTRL_SET);
                clk_disable_unprepare(mxs_phy->clk);
        } else {
-               clk_prepare_enable(mxs_phy->clk);
+               ret = clk_prepare_enable(mxs_phy->clk);
+               if (ret)
+                       return ret;
                writel(BM_USBPHY_CTRL_CLKGATE,
                       x->io_priv + HW_USBPHY_CTRL_CLR);
                writel(0, x->io_priv + HW_USBPHY_PWD);
@@ -160,8 +167,6 @@ static int mxs_phy_probe(struct platform_device *pdev)
        mxs_phy->phy.notify_disconnect  = mxs_phy_on_disconnect;
        mxs_phy->phy.type               = USB_PHY_TYPE_USB2;
 
-       ATOMIC_INIT_NOTIFIER_HEAD(&mxs_phy->phy.notifier);
-
        mxs_phy->clk = clk;
 
        platform_set_drvdata(pdev, mxs_phy);