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

Commit 0d9030a2 authored Jun 05, 2015 by Octavian Purdila Committed by Alexandre Belloni Sep 05, 2015

rtc: fix drivers that consider 0 as a valid IRQ in client->irq



Since dab472eb ("i2c / ACPI: Use 0 to indicate that device does not
have interrupt assigned"), 0 is not a valid i2c client irq anymore, so
change all driver's checks accordingly.

The same issue occurs when the device is instantiated via device tree
with no IRQ, or from the i2c sysfs interface, even before the patch
above.

Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

parent 1e4cd625

drivers/rtc/rtc-ds1374.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -688,7 +688,7 @@ static int ds1374_suspend(struct device *dev)
		{
		struct i2c_client *client = to_i2c_client(dev);

		if (client->irq >= 0 && device_may_wakeup(&client->dev))
		if (client->irq > 0 && device_may_wakeup(&client->dev))
		enable_irq_wake(client->irq);
		return 0;
		}
		@@ -697,7 +697,7 @@ static int ds1374_resume(struct device *dev)
		{
		struct i2c_client *client = to_i2c_client(dev);

		if (client->irq >= 0 && device_may_wakeup(&client->dev))
		if (client->irq > 0 && device_may_wakeup(&client->dev))
		disable_irq_wake(client->irq);
		return 0;
		}

drivers/rtc/rtc-ds3232.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -443,7 +443,7 @@ static int ds3232_remove(struct i2c_client *client)
		{
		struct ds3232 *ds3232 = i2c_get_clientdata(client);

		if (client->irq >= 0) {
		if (client->irq > 0) {
		mutex_lock(&ds3232->mutex);
		ds3232->exiting = 1;
		mutex_unlock(&ds3232->mutex);