Commit 4bcd9eae authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman

fbtft: Fix the initialization from property algorithm

When converting to device property API the commit
8b2d3aee ("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: 8b2d3aee ("fbtft: Make use of device property API")
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20191121140207.65089-1-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c724f776
...@@ -913,7 +913,7 @@ static int fbtft_init_display_from_property(struct fbtft_par *par) ...@@ -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) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment