diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2020-04-04 02:00:05 +0200 |
|---|---|---|
| committer | Peter Chen <peter.chen@nxp.com> | 2020-04-08 09:37:24 +0800 |
| commit | c2de37b31f178c4a4164751e9fef19acd3ceb913 (patch) | |
| tree | 3f342c7e5e82752d7434ccd0b6ada30c829fa13f /drivers/usb | |
| parent | 8b93527071a81425532c1b22067f6201e51c7b7d (diff) | |
| download | linux-stable-c2de37b31f178c4a4164751e9fef19acd3ceb913.tar.gz linux-stable-c2de37b31f178c4a4164751e9fef19acd3ceb913.tar.bz2 linux-stable-c2de37b31f178c4a4164751e9fef19acd3ceb913.zip | |
usb: chipidea: usb2: make clock optional
Allow clock to be missing from DT (assume it's enabled then).
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/chipidea/ci_hdrc_usb2.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/chipidea/ci_hdrc_usb2.c b/drivers/usb/chipidea/ci_hdrc_usb2.c index bf300a234e64..9086514840ed 100644 --- a/drivers/usb/chipidea/ci_hdrc_usb2.c +++ b/drivers/usb/chipidea/ci_hdrc_usb2.c @@ -64,13 +64,14 @@ static int ci_hdrc_usb2_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; - priv->clk = devm_clk_get(dev, NULL); - if (!IS_ERR(priv->clk)) { - ret = clk_prepare_enable(priv->clk); - if (ret) { - dev_err(dev, "failed to enable the clock: %d\n", ret); - return ret; - } + priv->clk = devm_clk_get_optional(dev, NULL); + if (IS_ERR(priv->clk)) + return PTR_ERR(priv->clk);; + + ret = clk_prepare_enable(priv->clk); + if (ret) { + dev_err(dev, "failed to enable the clock: %d\n", ret); + return ret; } ci_pdata->name = dev_name(dev); @@ -94,8 +95,7 @@ static int ci_hdrc_usb2_probe(struct platform_device *pdev) return 0; clk_err: - if (!IS_ERR(priv->clk)) - clk_disable_unprepare(priv->clk); + clk_disable_unprepare(priv->clk); return ret; } |