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

Commit 6839c1b0 authored Sep 23, 2015 by Octavian Purdila Committed by Jonathan Cameron Oct 03, 2015

iio: fix drivers that use 0 as a valid IRQ in client->irq (part 2)



Since commit 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>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

parent 1de953e7

drivers/iio/accel/stk8312.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -572,7 +572,7 @@ static int stk8312_probe(struct i2c_client *client,
		if (client->irq < 0)
		client->irq = stk8312_gpio_probe(client);

		if (client->irq >= 0) {
		if (client->irq > 0) {
		ret = devm_request_threaded_irq(&client->dev, client->irq,
		stk8312_data_rdy_trig_poll,
		NULL,

drivers/iio/accel/stk8ba50.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -468,7 +468,7 @@ static int stk8ba50_probe(struct i2c_client *client,
		if (client->irq < 0)
		client->irq = stk8ba50_gpio_probe(client);

		if (client->irq >= 0) {
		if (client->irq > 0) {
		ret = devm_request_threaded_irq(&client->dev, client->irq,
		stk8ba50_data_rdy_trig_poll,
		NULL,

drivers/iio/light/stk3310.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -632,7 +632,7 @@ static int stk3310_probe(struct i2c_client *client,
		}
		}

		if (client->irq >= 0) {
		if (client->irq > 0) {
		ret = devm_request_threaded_irq(&client->dev, client->irq,
		stk3310_irq_handler,
		stk3310_irq_event_handler,