Просмотр исходного кода

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

Since commit dab472eb931bc291 ("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>
Octavian Purdila 10 лет назад
Родитель
Сommit
6839c1b070
3 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      drivers/iio/accel/stk8312.c
  2. 1 1
      drivers/iio/accel/stk8ba50.c
  3. 1 1
      drivers/iio/light/stk3310.c

+ 1 - 1
drivers/iio/accel/stk8312.c

@@ -572,7 +572,7 @@ static int stk8312_probe(struct i2c_client *client,
 	if (client->irq < 0)
 	if (client->irq < 0)
 		client->irq = stk8312_gpio_probe(client);
 		client->irq = stk8312_gpio_probe(client);
 
 
-	if (client->irq >= 0) {
+	if (client->irq > 0) {
 		ret = devm_request_threaded_irq(&client->dev, client->irq,
 		ret = devm_request_threaded_irq(&client->dev, client->irq,
 						stk8312_data_rdy_trig_poll,
 						stk8312_data_rdy_trig_poll,
 						NULL,
 						NULL,

+ 1 - 1
drivers/iio/accel/stk8ba50.c

@@ -468,7 +468,7 @@ static int stk8ba50_probe(struct i2c_client *client,
 	if (client->irq < 0)
 	if (client->irq < 0)
 		client->irq = stk8ba50_gpio_probe(client);
 		client->irq = stk8ba50_gpio_probe(client);
 
 
-	if (client->irq >= 0) {
+	if (client->irq > 0) {
 		ret = devm_request_threaded_irq(&client->dev, client->irq,
 		ret = devm_request_threaded_irq(&client->dev, client->irq,
 						stk8ba50_data_rdy_trig_poll,
 						stk8ba50_data_rdy_trig_poll,
 						NULL,
 						NULL,

+ 1 - 1
drivers/iio/light/stk3310.c

@@ -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,
 		ret = devm_request_threaded_irq(&client->dev, client->irq,
 						stk3310_irq_handler,
 						stk3310_irq_handler,
 						stk3310_irq_event_handler,
 						stk3310_irq_event_handler,