diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-25 08:01:25 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-25 08:01:25 +0200 |
| commit | 087faf77a57b06f9a8ce37781c68e3f02468322b (patch) | |
| tree | 4c82cc3a0dbee524efde56901c5674281c831675 /drivers/video | |
| parent | Merge branch 'mb862xxfb-for-next' of git://git.denx.de/linux-2.6-agust (diff) | |
| parent | sh_mobile_meram: Safely disable MERAM operation when not initialized (diff) | |
| download | linux-087faf77a57b06f9a8ce37781c68e3f02468322b.tar.xz linux-087faf77a57b06f9a8ce37781c68e3f02468322b.zip | |
Merge branch 'common/fbdev-meram' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | 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 aa4fe993b6da..404c03b4b7c7 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; |