usb: phy: phy-mxs-usb: Check the return value from stmp_reset_block()

stmp_reset_block() may fail, so let's check its return value and propagate it
in the case of error.

Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index bd601c537c8d434a3e33a7aa59d88d583472244f..fdd33b44dbd31b929eb13a2c0bd138570ccebc37 100644 (file)
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -41,11 +41,14 @@ struct mxs_phy {
 
 #define to_mxs_phy(p) container_of((p), struct mxs_phy, phy)
 
-static void mxs_phy_hw_init(struct mxs_phy *mxs_phy)
+static int mxs_phy_hw_init(struct mxs_phy *mxs_phy)
 {
+       int ret;
        void __iomem *base = mxs_phy->phy.io_priv;
 
-       stmp_reset_block(base + HW_USBPHY_CTRL);
+       ret = stmp_reset_block(base + HW_USBPHY_CTRL);
+       if (ret)
+               return ret;
 
        /* Power up the PHY */
        writel(0, base + HW_USBPHY_PWD);
@@ -54,6 +57,8 @@ static void mxs_phy_hw_init(struct mxs_phy *mxs_phy)
        writel(BM_USBPHY_CTRL_ENUTMILEVEL2 |
               BM_USBPHY_CTRL_ENUTMILEVEL3,
               base + HW_USBPHY_CTRL_SET);
+
+       return 0;
 }
 
 static int mxs_phy_init(struct usb_phy *phy)
@@ -61,9 +66,7 @@ static int mxs_phy_init(struct usb_phy *phy)
        struct mxs_phy *mxs_phy = to_mxs_phy(phy);
 
        clk_prepare_enable(mxs_phy->clk);
-       mxs_phy_hw_init(mxs_phy);
-
-       return 0;
+       return mxs_phy_hw_init(mxs_phy);
 }
 
 static void mxs_phy_shutdown(struct usb_phy *phy)