RTC: v3020 driver bugfix
PATCH 1/1 RTC: v3020 driver bugfix
v3020 read_bit always returns 0 when left_shift > 7
The v3020 read_bit function's return type is (unsigned char). The code returns a value masked by (1 << left_shift) that is casted to the return type. If left_shift is larger than 7, the cast will always result in a 0 return value. The problem was discovered with left_shift = 16, and the included patch corrects the problem.
The bug was introduced in the last (Apr 3 2009) commit of the file, kernel versions 2.6.30 and later.
drivers/rtc/rtc-v3020.c 2009-10-19 14:06:27.000000000 -1000 renamed from drivers/rtc/rtc-v3020.c 2009-10-15 14:41:50.000000000 -1000 +1 -1
@@ -96,7 +96,7 @@ static unsigned char v3020_mmio_read_bit(struct v3020 *chip) { - return readl(chip->ioaddress) & (1 << chip->leftshift); + return ((readl(chip->ioaddress) & (1 << chip->leftshift)) != 0); } static struct v3020_chip_ops v3020_mmio_ops = {
Scott Valentine
Concentris Systems LLC
Manoa Innovation Center, Suite #238
2800 Woodlawn Drive
Honolulu, HI 96822
Quoted 15 lines · On Mon, 19 Oct 2009 15:11:23 -1000 (HST) "Scott Valentine"…
v3020
read_bitalways returns 0 whenleft_shift> 7The v3020
read_bitfunction's return type is (unsigned char). The code returns a value masked by (1 <<left_shift) that is casted to the return type. Ifleft_shiftis larger than 7, the cast will always result in a 0 return value. The problem was discovered withleft_shift= 16, and the included patch corrects the problem.The bug was introduced in the last (Apr 3 2009) commit of the file, kernel versions 2.6.30 and later.
diff -uNr
a/drivers/rtc/rtc-v3020.cb/drivers/rtc/rtc-v3020.c
drivers/rtc/rtc-v3020.c 2009-10-19 14:06:27.000000000 -1000 line 102
Quoted 8 lines
drivers/rtc/rtc-v3020.c 2009-10-19 14:06:27.000000000 -1000 renamed from drivers/rtc/rtc-v3020.c 2009-10-15 14:41:50.000000000 -1000 +1
-1@@ -96,7 +96,7 @@ static unsigned char v3020_mmio_read_bit(struct v3020 *chip) { - return readl(chip->ioaddress) & (1 << chip->leftshift); + return ((readl(chip->ioaddress) & (1 << chip->leftshift)) != 0); } static struct v3020_chip_ops v3020_mmio_ops = {
OK.
It's strange that the function returns `unsigned char' instead of say int or bool.
We may as well do this in the same way as v3020_gpio_read_bit():
drivers/rtc/rtc-v3020.c renamed from drivers/rtc/rtc-v3020.c~rtc-v3020-fix-v3020_mmio_read_bit +1 -1
@@ -96,7 +96,7 @@ static void v3020_mmio_write_bit(structstatic unsigned char v3020_mmio_read_bit (struct v3020 *chip) { -return readl (chip->ioaddress) & (1 << chip->leftshift); +return !!(readl (chip->ioaddress) & (1 << chip->leftshift)); }static struct v3020_chip_ops v3020_mmio_ops = {
_
You didn't include a Signed-off-by: for this patch.