openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fbtft: Fix the initialization from property algorithm 

When converting to device property API the commit
8b2d3aeeb7 ("fbtft: Make use of device property API")
mistakenly placed the reading of the first value inside the loop,
that jumps over value after initialization sequence or sleep commands.

Move the above mentioned reading outside of the loop to restore
correct behaviour.

Besides that, we are using pre-increment operation which may lead to
out of the boundary access at the end of sequence. Thus, allocate buffer
with an additional element at the end to prevent out of the boundary
access.

Fixes: 8b2d3aeeb7 ("fbtft: Make use of device property API")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20191121140207.65089-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andy Shevchenko 2019-11-21 16:02:07 +02:00 committed by Greg Kroah-Hartman
parent c724f776f0
commit 4bcd9eae73
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/fbtft/fbtft-core.c
View File

@ -913,7 +913,7 @@ static int fbtft_init_display_from_property(struct fbtft_par *par)
if (count == 0) if (count == 0)
return -EINVAL; return -EINVAL;
values = kmalloc_array(count, sizeof(*values), GFP_KERNEL); values = kmalloc_array(count + 1, sizeof(*values), GFP_KERNEL);
if (!values) if (!values)
return -ENOMEM; return -ENOMEM;
@ -926,9 +926,9 @@ static int fbtft_init_display_from_property(struct fbtft_par *par)
gpiod_set_value(par->gpio.cs, 0); /* Activate chip */ gpiod_set_value(par->gpio.cs, 0); /* Activate chip */
index = -1; index = -1;
while (index < count) { val = values[++index];
val = values[++index];
while (index < count) {
if (val & FBTFT_OF_INIT_CMD) { if (val & FBTFT_OF_INIT_CMD) {
val &= 0xFFFF; val &= 0xFFFF;
i = 0; i = 0;