diff options
| author | Hartmut Knaack <knaack.h@gmx.de> | 2015-07-09 23:51:29 +0200 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2015-07-19 14:53:16 +0100 |
| commit | 037e966f2d63896129220112644f32962af6d115 (patch) | |
| tree | 54ee1dfff326d82657179b66261350c000a6b567 /drivers/iio | |
| parent | c5d0db0690ff0a963dc082e7645268c466bf9a84 (diff) | |
| download | talos-obmc-linux-037e966f2d63896129220112644f32962af6d115.tar.gz talos-obmc-linux-037e966f2d63896129220112644f32962af6d115.zip | |
iio:light:stk3310: move device register to end of probe
iio_device_register should be the last operation during probe. Therefor
move up interrupt setup code and while at it, change the check for invalid
values of client->irq to be smaller than zero.
Fixes: 3dd477acbdd1 ("iio: light: Add threshold interrupt support for STK3310")
As the device_register makes the userspace interfaces of the device available
it is possible for requests to come in before the probe sequence has finished.
This can lead to unhandled interrupts and similar.
Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
Reviewed-by: Tiberiu Breana <tiberiu.a.breana@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/light/stk3310.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c index c1a218236be5..e7e6e5a2b1f8 100644 --- a/drivers/iio/light/stk3310.c +++ b/drivers/iio/light/stk3310.c @@ -608,13 +608,7 @@ static int stk3310_probe(struct i2c_client *client, if (ret < 0) return ret; - ret = iio_device_register(indio_dev); - if (ret < 0) { - dev_err(&client->dev, "device_register failed\n"); - stk3310_set_state(data, STK3310_STATE_STANDBY); - } - - if (client->irq <= 0) + if (client->irq < 0) client->irq = stk3310_gpio_probe(client); if (client->irq >= 0) { @@ -629,6 +623,12 @@ static int stk3310_probe(struct i2c_client *client, client->irq); } + ret = iio_device_register(indio_dev); + if (ret < 0) { + dev_err(&client->dev, "device_register failed\n"); + stk3310_set_state(data, STK3310_STATE_STANDBY); + } + return ret; } |
