summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Niederprüm <niederp@physik.uni-kl.de>2015-03-31 21:27:07 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-05-27 12:53:16 +0300
commit258c0ea21d3aa974b43e5ce6c2f7c94553a3b1cc (patch)
tree374101e8408244996544ac0d9d08f9b0c3a6d219
parent2fa3b4c4a78a5db3502ab9e32630ea660ff923d0 (diff)
downloadlinux-258c0ea21d3aa974b43e5ce6c2f7c94553a3b1cc.tar.xz
fbdev: ssd1307fb: fix memory address smem_start.
the smem_start pointer of the framebuffer info struct needs to hold the physical address rather than the logical address. Right now the logical address returned by kmalloc is stored. This patch converts this address to a physical address and thus fixes a driver crash on mmaping the framebuffer memory due to an access to the wrong memory address. Signed-off-by: Thomas Niederprüm <niederp@physik.uni-kl.de> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/fbdev/ssd1307fb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c
index f7ed6d9016f7..61e0ce866506 100644
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c
@@ -515,7 +515,7 @@ static int ssd1307fb_probe(struct i2c_client *client,
info->var.blue.offset = 0;
info->screen_base = (u8 __force __iomem *)vmem;
- info->fix.smem_start = (unsigned long)vmem;
+ info->fix.smem_start = __pa(vmem);
info->fix.smem_len = vmem_size;
fb_deferred_io_init(info);