diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-11-22 00:56:58 +0100 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-03-12 22:41:13 +0100 |
commit | 97d16fe69b6499a14a0c85c053f7bef54ce992a4 (patch) | |
tree | 71dd7643398c2075e1d655555cd1562391b4cfcd /drivers/video/sh_mobile_lcdcfb.c | |
parent | c241a0e0c27882ecab1df57a44d202db6e02012c (diff) | |
download | linux-stable-97d16fe69b6499a14a0c85c053f7bef54ce992a4.tar.gz linux-stable-97d16fe69b6499a14a0c85c053f7bef54ce992a4.tar.bz2 linux-stable-97d16fe69b6499a14a0c85c053f7bef54ce992a4.zip |
fbdev: sh_mobile_meram: Don't perform update in register operation
Remove the RGB or Y/C base address update from the meram_register()
operation, as this belongs to the meram_update() operation.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/video/sh_mobile_lcdcfb.c')
-rw-r--r-- | drivers/video/sh_mobile_lcdcfb.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index 033851618323..4b54cd5c9564 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c @@ -882,11 +882,13 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv) meram = mdev->ops->meram_register(mdev, ch->cfg->meram_cfg, ch->pitch, ch->yres, pixelformat, - ch->base_addr_y, ch->base_addr_c, - &ch->base_addr_y, &ch->base_addr_c, &ch->pitch); - if (!IS_ERR(meram)) + if (!IS_ERR(meram)) { + mdev->ops->meram_update(mdev, meram, + ch->base_addr_y, ch->base_addr_c, + &ch->base_addr_y, &ch->base_addr_c); ch->meram = meram; + } } /* Start the LCDC. */ |