summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-05-25 15:01:25 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-05-25 15:01:25 +0900
commit087faf77a57b06f9a8ce37781c68e3f02468322b (patch)
tree4c82cc3a0dbee524efde56901c5674281c831675 /drivers/video
parente2968f7018193eb5385a925225f135c9ba61eb93 (diff)
parenteae9b85b5f65027df64130d8a3eeb2de9d094eda (diff)
downloadlinux-3.10-087faf77a57b06f9a8ce37781c68e3f02468322b.tar.gz
linux-3.10-087faf77a57b06f9a8ce37781c68e3f02468322b.tar.bz2
linux-3.10-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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index aa4fe993b6d..404c03b4b7c 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;