diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-23 18:52:20 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-02 16:15:03 +0300 |
| commit | fa5721d159bb1da086d85c34f358282d4ae07093 (patch) | |
| tree | e892fb709b6fce3f819280c9598913820bcc9ee3 /drivers/media/i2c/adv7180.c | |
| parent | 24692801a4d03dabb64e38b10d089beb3710be9d (diff) | |
| download | linux-fa5721d159bb1da086d85c34f358282d4ae07093.tar.xz | |
[media] adv7180: Do not request the IRQ again during resume
Currently the IRQ is requested from within the init_device() function. This
function is not only called during device probe, but also during resume
causing the driver to try to request the IRQ again. Move requesting the IRQ
from init_device() to the probe function to make sure that it is only
requested once.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Federico Vaga <federico.vaga@gmail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/i2c/adv7180.c')
| -rw-r--r-- | drivers/media/i2c/adv7180.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c index 94a3341b091b..7666d10d3f16 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c @@ -553,11 +553,6 @@ static int init_device(struct i2c_client *client, struct adv7180_state *state) /* register for interrupts */ if (state->irq > 0) { - ret = request_threaded_irq(state->irq, NULL, adv7180_irq, - IRQF_ONESHOT, KBUILD_MODNAME, state); - if (ret) - return ret; - ret = i2c_smbus_write_byte_data(client, ADV7180_ADI_CTRL_REG, ADV7180_ADI_CTRL_IRQ_SPACE); if (ret < 0) @@ -597,7 +592,6 @@ static int init_device(struct i2c_client *client, struct adv7180_state *state) return 0; err: - free_irq(state->irq, state); return ret; } @@ -634,6 +628,13 @@ static int adv7180_probe(struct i2c_client *client, if (ret) goto err_free_ctrl; + if (state->irq) { + ret = request_threaded_irq(client->irq, NULL, adv7180_irq, + IRQF_ONESHOT, KBUILD_MODNAME, state); + if (ret) + goto err_free_ctrl; + } + ret = v4l2_async_register_subdev(sd); if (ret) goto err_free_irq; |