Commit c2de37b3 authored by Michał Mirosław's avatar Michał Mirosław Committed by Peter Chen

usb: chipidea: usb2: make clock optional

Allow clock to be missing from DT (assume it's enabled then).
Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
parent 8b935270
...@@ -64,13 +64,14 @@ static int ci_hdrc_usb2_probe(struct platform_device *pdev) ...@@ -64,13 +64,14 @@ static int ci_hdrc_usb2_probe(struct platform_device *pdev)
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
priv->clk = devm_clk_get(dev, NULL); priv->clk = devm_clk_get_optional(dev, NULL);
if (!IS_ERR(priv->clk)) { if (IS_ERR(priv->clk))
ret = clk_prepare_enable(priv->clk); return PTR_ERR(priv->clk);;
if (ret) {
dev_err(dev, "failed to enable the clock: %d\n", ret); ret = clk_prepare_enable(priv->clk);
return ret; if (ret) {
} dev_err(dev, "failed to enable the clock: %d\n", ret);
return ret;
} }
ci_pdata->name = dev_name(dev); ci_pdata->name = dev_name(dev);
...@@ -94,8 +95,7 @@ static int ci_hdrc_usb2_probe(struct platform_device *pdev) ...@@ -94,8 +95,7 @@ static int ci_hdrc_usb2_probe(struct platform_device *pdev)
return 0; return 0;
clk_err: clk_err:
if (!IS_ERR(priv->clk)) clk_disable_unprepare(priv->clk);
clk_disable_unprepare(priv->clk);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment