Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1713e903 authored by Jean-Baptiste Maneyrol's avatar Jean-Baptiste Maneyrol Committed by Linus Torvalds
Browse files

[PATCH] rtc driver rtc-pcf8563 century bit inversed 



The century bit PCF8563_MO_C in the month register is misinterpreted.  It
is set to 1 for the 20th century and 0 for 21th, and the driver is
expecting the opposite behavior.

Acked-by: default avatarAlessandro Zummo <a.zummo@towertech.it>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 365e0223

drivers/rtc/rtc-pcf8563.c

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm) 
	tm->tm_wday = buf[PCF8563_REG_DW] & 0x07;

	tm->tm_mon = BCD2BIN(buf[PCF8563_REG_MO] & 0x1F) - 1; /* rtc mn 1-12 */

	tm->tm_year = BCD2BIN(buf[PCF8563_REG_YR])

		+ (buf[PCF8563_REG_MO] & PCF8563_MO_C ? 100 : 0);

		+ (buf[PCF8563_REG_MO] & PCF8563_MO_C ? 0 : 100);



	dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "

		"mday=%d, mon=%d, year=%d, wday=%d\n",
@@ -135,7 +135,7 @@ static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm) 


	/* year and century */

	buf[PCF8563_REG_YR] = BIN2BCD(tm->tm_year % 100);

	if (tm->tm_year / 100)

	if (tm->tm_year < 100)

		buf[PCF8563_REG_MO] |= PCF8563_MO_C;



	buf[PCF8563_REG_DW] = tm->tm_wday & 0x07;