lkml.org 
[lkml]   [2015]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 1/2] iio: fix drivers that use 0 as a valid IRQ in client->irq (part 2)
From
Date
On 23/09/15 10:02, Octavian Purdila wrote:
> 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>
Applied to the togreg branch of iio.git. Initially pushed out as
testing for the autobuilders to play with it.

Thanks,

Jonathan
> ---
> drivers/iio/accel/stk8312.c | 2 +-
> drivers/iio/accel/stk8ba50.c | 2 +-
> drivers/iio/light/stk3310.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/accel/stk8312.c b/drivers/iio/accel/stk8312.c
> index c764af2..a578694 100644
> --- a/drivers/iio/accel/stk8312.c
> +++ b/drivers/iio/accel/stk8312.c
> @@ -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,
> diff --git a/drivers/iio/accel/stk8ba50.c b/drivers/iio/accel/stk8ba50.c
> index 80f77d8..a59f5d8 100644
> --- a/drivers/iio/accel/stk8ba50.c
> +++ b/drivers/iio/accel/stk8ba50.c
> @@ -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,
> diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c
> index 25c6a71..4e56c90 100644
> --- a/drivers/iio/light/stk3310.c
> +++ b/drivers/iio/light/stk3310.c
> @@ -636,7 +636,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,
>



\
 
 \ /
  Last update: 2015-10-03 12:21    [W:0.044 / U:2.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site