diff options
| -rw-r--r-- | drivers/video/sh_mobile_hdmi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c index 5e2845b9f3a8..9a33ee0413fb 100644 --- a/drivers/video/sh_mobile_hdmi.c +++ b/drivers/video/sh_mobile_hdmi.c | |||
| @@ -1326,7 +1326,7 @@ static int __init sh_hdmi_probe(struct platform_device *pdev) | |||
| 1326 | goto erate; | 1326 | goto erate; |
| 1327 | } | 1327 | } |
| 1328 | 1328 | ||
| 1329 | ret = clk_enable(hdmi->hdmi_clk); | 1329 | ret = clk_prepare_enable(hdmi->hdmi_clk); |
| 1330 | if (ret < 0) { | 1330 | if (ret < 0) { |
| 1331 | dev_err(hdmi->dev, "Cannot enable clock: %d\n", ret); | 1331 | dev_err(hdmi->dev, "Cannot enable clock: %d\n", ret); |
| 1332 | goto erate; | 1332 | goto erate; |
| @@ -1404,7 +1404,7 @@ emap_htop1: | |||
| 1404 | emap: | 1404 | emap: |
| 1405 | release_mem_region(res->start, resource_size(res)); | 1405 | release_mem_region(res->start, resource_size(res)); |
| 1406 | ereqreg: | 1406 | ereqreg: |
| 1407 | clk_disable(hdmi->hdmi_clk); | 1407 | clk_disable_unprepare(hdmi->hdmi_clk); |
| 1408 | erate: | 1408 | erate: |
| 1409 | clk_put(hdmi->hdmi_clk); | 1409 | clk_put(hdmi->hdmi_clk); |
| 1410 | 1410 | ||
| @@ -1425,7 +1425,7 @@ static int __exit sh_hdmi_remove(struct platform_device *pdev) | |||
| 1425 | cancel_delayed_work_sync(&hdmi->edid_work); | 1425 | cancel_delayed_work_sync(&hdmi->edid_work); |
| 1426 | pm_runtime_put(&pdev->dev); | 1426 | pm_runtime_put(&pdev->dev); |
| 1427 | pm_runtime_disable(&pdev->dev); | 1427 | pm_runtime_disable(&pdev->dev); |
| 1428 | clk_disable(hdmi->hdmi_clk); | 1428 | clk_disable_unprepare(hdmi->hdmi_clk); |
| 1429 | clk_put(hdmi->hdmi_clk); | 1429 | clk_put(hdmi->hdmi_clk); |
| 1430 | if (hdmi->htop1) | 1430 | if (hdmi->htop1) |
| 1431 | iounmap(hdmi->htop1); | 1431 | iounmap(hdmi->htop1); |
