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

Commit 72fca4a4 authored by Jan Luebbe's avatar Jan Luebbe Committed by Linus Torvalds
Browse files

drivers/rtc/rtc-isl1208.c: call rtc_update_irq() from the alarm irq handler 



Previously the alarm event was not propagated into the RTC subsystem.
By adding a call to rtc_update_irq, this fixes a timeout problem with
the hwclock utility.

Signed-off-by: default avatarJan Luebbe <jlu@pengutronix.de>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 275aaa68

drivers/rtc/rtc-isl1208.c

+3 −0
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ isl1208_rtc_interrupt(int irq, void *data) 
{

	unsigned long timeout = jiffies + msecs_to_jiffies(1000);

	struct i2c_client *client = data;

	struct rtc_device *rtc = i2c_get_clientdata(client);

	int handled = 0, sr, err;



	/*
@@ -528,6 +529,8 @@ isl1208_rtc_interrupt(int irq, void *data) 
	if (sr & ISL1208_REG_SR_ALM) {

		dev_dbg(&client->dev, "alarm!\n");



		rtc_update_irq(rtc, 1, RTC_IRQF | RTC_AF);



		/* Clear the alarm */

		sr &= ~ISL1208_REG_SR_ALM;

		sr = i2c_smbus_write_byte_data(client, ISL1208_REG_SR, sr);