2010-04-25 20:15:49

by Bruno Prémont

Subject: [PATCH] hid: fix picolcd's version parsing

During grouping of version checking code bootloader mode's version
bytes got swapped. Fix their order.

Signed-off-by: Bruno Prémont <[email protected]>
---
drivers/hid/hid-picolcd.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/hid/hid-picolcd.c b/drivers/hid/hid-picolcd.c
index 0fbc7d3..6f71c60 100644
--- a/drivers/hid/hid-picolcd.c
+++ b/drivers/hid/hid-picolcd.c
@@ -1196,16 +1196,14 @@ static int picolcd_check_version(struct hid_device *hdev)
}

if (verinfo->raw_size == 2) {
+ data->version[0] = verinfo->raw_data[1];
+ data->version[1] = verinfo->raw_data[0];
if (data->status & PICOLCD_BOOTLOADER) {
dev_info(&hdev->dev, "PicoLCD, bootloader version %d.%d\n",
- verinfo->raw_data[0], verinfo->raw_data[1]);
- data->version[0] = verinfo->raw_data[0];
- data->version[1] = verinfo->raw_data[1];
+ verinfo->raw_data[1], verinfo->raw_data[0]);
} else {
dev_info(&hdev->dev, "PicoLCD, firmware version %d.%d\n",
verinfo->raw_data[1], verinfo->raw_data[0]);
- data->version[0] = verinfo->raw_data[1];
- data->version[1] = verinfo->raw_data[0];
}
} else {
dev_err(&hdev->dev, "confused, got unexpected version response from PicoLCD\n");
--
1.6.4.4

2010-04-26 09:44:33

by Jiri Kosina

Subject: Re: [PATCH] hid: fix picolcd's version parsing

On Sun, 25 Apr 2010, Bruno Prémont wrote:

> During grouping of version checking code bootloader mode's version
> bytes got swapped. Fix their order.

Applied, thanks Bruno.

--
Jiri Kosina
SUSE Labs, Novell Inc.