From d615d304b1c110709d477cb508cffa490a75bf6c Mon Sep 17 00:00:00 2001 From: Damian Hobson-Garcia Date: Mon, 4 Jul 2011 08:06:47 +0200 Subject: [PATCH] --- yaml --- r: 271279 b: refs/heads/master c: ec19b9e0fa808d82ad996d73358a5b06a565b78b h: refs/heads/master i: 271277: 29898761524dadd285203c6b1b1fa3e01650f292 271275: 5bb25bbf4e95c31c8dd36c2ed58a7e5bca4e4e58 271271: f85e038fdc0e7f1b7c7ca0d0104814c8093e9c8c 271263: fdeb8e801d239f7c73dcddad510ee1141b0dbafd v: v3 --- [refs] | 2 +- trunk/drivers/video/sh_mobile_lcdcfb.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e8e8eb6fa79f..31cc9e1880db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 176737782e8360f1e577264c7aaeb691a7cbbfdd +refs/heads/master: ec19b9e0fa808d82ad996d73358a5b06a565b78b diff --git a/trunk/drivers/video/sh_mobile_lcdcfb.c b/trunk/drivers/video/sh_mobile_lcdcfb.c index b048417247e8..2f921ad18559 100644 --- a/trunk/drivers/video/sh_mobile_lcdcfb.c +++ b/trunk/drivers/video/sh_mobile_lcdcfb.c @@ -259,6 +259,8 @@ static void sh_mobile_lcdc_clk_on(struct sh_mobile_lcdc_priv *priv) pm_runtime_get_sync(priv->dev); if (priv->dot_clk) clk_enable(priv->dot_clk); + if (priv->meram_dev && priv->meram_dev->pdev) + pm_runtime_get_sync(&priv->meram_dev->pdev->dev); } } @@ -267,6 +269,8 @@ static void sh_mobile_lcdc_clk_off(struct sh_mobile_lcdc_priv *priv) if (atomic_sub_return(1, &priv->hw_usecnt) == -1) { if (priv->dot_clk) clk_disable(priv->dot_clk); + if (priv->meram_dev && priv->meram_dev->pdev) + pm_runtime_put_sync(&priv->meram_dev->pdev->dev); pm_runtime_put(priv->dev); } }