summaryrefslogtreecommitdiffstats
path: root/drivers/staging/fbtft/flexfb.c
diff options
context:
space:
mode:
authorNoralf Trønnes <noralf@tronnes.org>2015-07-30 19:55:01 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-03 17:45:02 -0700
commitad6d8812aa9574b11d5f7a0d322d3b42be24206d (patch)
tree54e585a31b2b873b3d19e975bbf4b0c6526d15cb /drivers/staging/fbtft/flexfb.c
parentbc7ac432536710193adfb7a05488f8c2e20fbbc2 (diff)
downloadlinux-ad6d8812aa9574b11d5f7a0d322d3b42be24206d.tar.bz2
staging: fbtft: core: Don't set device platform_data
Pass platform_data as an argument to fbtft_framebuffer_alloc() instead of using dev->platform_data. This fixes an issue where the device comes from Device Tree and fbtft_probe_common() sets dev->platform_data to allocated memory. When the module is reloaded, dev->platform_data points to freed memory. Signed-off-by: Noralf Trønnes <noralf@tronnes.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/fbtft/flexfb.c')
-rw-r--r--drivers/staging/fbtft/flexfb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/fbtft/flexfb.c b/drivers/staging/fbtft/flexfb.c
index ce6e3ae30a2e..5b4c7124a6ee 100644
--- a/drivers/staging/fbtft/flexfb.c
+++ b/drivers/staging/fbtft/flexfb.c
@@ -379,7 +379,7 @@ static int flexfb_probe_common(struct spi_device *sdev,
fbtft_init_dbg(dev, "regwidth = %d\n", regwidth);
fbtft_init_dbg(dev, "buswidth = %d\n", buswidth);
- info = fbtft_framebuffer_alloc(&flex_display, dev);
+ info = fbtft_framebuffer_alloc(&flex_display, dev, dev->platform_data);
if (!info)
return -ENOMEM;