Merge tag 'for-v3.17' of git://git.infradead.org/battery-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / usb / phy / phy-msm-usb.c

diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index c929370cdaa64454201d7b2a1884f0d88f3c87a8..e4108eec5ef4153c7370f405040618cd1df41114 100644 (file)
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -279,11 +279,11 @@ static int msm_otg_link_clk_reset(struct msm_otg *motg, bool assert)
 
 static int msm_otg_phy_clk_reset(struct msm_otg *motg)
 {
-       int ret;
+       int ret = 0;
 
-       if (motg->pdata->phy_clk_reset)
+       if (motg->pdata->phy_clk_reset && motg->phy_reset_clk)
                ret = motg->pdata->phy_clk_reset(motg->phy_reset_clk);
-       else
+       else if (motg->phy_rst)
                ret = reset_control_reset(motg->phy_rst);
 
        if (ret)
@@ -1429,7 +1429,7 @@ static void msm_otg_debugfs_cleanup(void)
        debugfs_remove(msm_otg_dbg_root);
 }
 
-static struct of_device_id msm_otg_dt_match[] = {
+static const struct of_device_id msm_otg_dt_match[] = {
        {
                .compatible = "qcom,usb-otg-ci",
                .data = (void *) CI_45NM_INTEGRATED_PHY
@@ -1466,7 +1466,7 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg)
 
        motg->phy_rst = devm_reset_control_get(&pdev->dev, "phy");
        if (IS_ERR(motg->phy_rst))
-               return PTR_ERR(motg->phy_rst);
+               motg->phy_rst = NULL;
 
        pdata->mode = of_usb_get_dr_mode(node);
        if (pdata->mode == USB_DR_MODE_UNKNOWN)
@@ -1558,7 +1558,7 @@ static int msm_otg_probe(struct platform_device *pdev)
                                           np ? "phy" : "usb_phy_clk");
        if (IS_ERR(motg->phy_reset_clk)) {
                dev_err(&pdev->dev, "failed to get usb_phy_clk\n");
-               return PTR_ERR(motg->phy_reset_clk);
+               motg->phy_reset_clk = NULL;
        }
 
        motg->clk = devm_clk_get(&pdev->dev, np ? "core" : "usb_hs_clk");