[PATCH 2/3] sh_mobile_meram: Safely disable MERAM operation when not initialized

[PATCH 2/3] sh_mobile_meram: Safely disable MERAM operation when not initialized

[Damian Hobson-Garcia]

If the MERAM platform data is defined, but the MERAM has not been
properly initaliazed we need to safely fall back to non-MERAM operation.

Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
---
 drivers/video/sh_mobile_lcdcfb.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index 1c652da..edf0d32 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -610,7 +610,8 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
 		pitch = ch->info->fix.line_length;
 
 		/* test if we can enable meram */
-		if (ch->cfg.meram_cfg && priv->meram_dev) {
+		if (ch->cfg.meram_cfg && priv->meram_dev &&
+				priv->meram_dev->ops) {
 			struct sh_mobile_meram_cfg *cfg;
 			struct sh_mobile_meram_info *mdev;
 			unsigned long icb_addr_y, icb_addr_c;
-- 
1.7.1

Re: [PATCH 2/3] sh_mobile_meram: Safely disable MERAM operation when not initialized

[Paul Mundt]

On Tue, May 24, 2011 at 04:01:21PM +0900, Damian Hobson-Garcia wrote:
> If the MERAM platform data is defined, but the MERAM has not been
> properly initaliazed we need to safely fall back to non-MERAM operation.
> 
> Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>

Applied, thanks. In the future please also Cc linux-fbdev, as ultimately
this all ends up going via the fbdev tree anyways.