Skip to content

Commit

Permalink
drm: shmob_drm: Check clk_prepare_enable() return value
Browse files Browse the repository at this point in the history
The clk_prepare_enable() call can fail. Check it's return value. We
can't propagate it all the way to the user as the KMS operations in
which the clock is enabled return a void.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Laurent Pinchart authored and Dave Airlie committed Dec 18, 2013
1 parent 66ee52e commit c0c72a8
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions drivers/gpu/drm/shmobile/shmob_drm_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,21 @@
* Clock management
*/

static void shmob_drm_clk_on(struct shmob_drm_device *sdev)
static int shmob_drm_clk_on(struct shmob_drm_device *sdev)
{
if (sdev->clock)
clk_prepare_enable(sdev->clock);
int ret;

if (sdev->clock) {
ret = clk_prepare_enable(sdev->clock);
if (ret < 0)
return ret;
}
#if 0
if (sdev->meram_dev && sdev->meram_dev->pdev)
pm_runtime_get_sync(&sdev->meram_dev->pdev->dev);
#endif

return 0;
}

static void shmob_drm_clk_off(struct shmob_drm_device *sdev)
Expand Down Expand Up @@ -161,6 +168,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)
struct drm_device *dev = sdev->ddev;
struct drm_plane *plane;
u32 value;
int ret;

if (scrtc->started)
return;
Expand All @@ -170,7 +178,9 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)
return;

/* Enable clocks before accessing the hardware. */
shmob_drm_clk_on(sdev);
ret = shmob_drm_clk_on(sdev);
if (ret < 0)
return;

/* Reset and enable the LCDC. */
lcdc_write(sdev, LDCNT2R, lcdc_read(sdev, LDCNT2R) | LDCNT2R_BR);
Expand Down

0 comments on commit c0c72a8

Please sign in to comment.