[13/21] Staging: asus_oled: fix image processing
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-02-10 22:50:08
Also in:
lkml
2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Pekka Paalanen <redacted>
commit 635032cb397b396241372fa0ff36ae758e658b23 upstream.
Programming an image was broken, because odev->buf_offs was not advanced
for val == 0 in append_values(). This regression was introduced in:
commit 1ff12a4aa354bed093a0240d5e6347b1e27601bc
Author: Kevin A. Granade [off-list ref]
Date: Sat Sep 5 01:03:39 2009 -0500
Staging: asus_oled: Cleaned up checkpatch issues.
Fix the image processing by special-casing val == 0.
I have tested this change on an Asus G50V laptop only.
Cc: Jakub Schmidtke <redacted>
Cc: Kevin A. Granade <redacted>
Signed-off-by: Pekka Paalanen <redacted>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/asus_oled/asus_oled.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- a/drivers/staging/asus_oled/asus_oled.c
+++ b/drivers/staging/asus_oled/asus_oled.c@@ -349,7 +349,14 @@ static void send_data(struct asus_oled_d static int append_values(struct asus_oled_dev *odev, uint8_t val, size_t count) { - while (count-- > 0 && val) { + odev->last_val = val; + + if (val == 0) { + odev->buf_offs += count; + return 0; + } + + while (count-- > 0) { size_t x = odev->buf_offs % odev->width; size_t y = odev->buf_offs / odev->width; size_t i;
@@ -400,7 +407,6 @@ static int append_values(struct asus_ole ; } - odev->last_val = val; odev->buf_offs++; }