diff options
author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2014-03-14 17:04:03 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-03-24 16:23:09 -0400 |
commit | df065b373f882c4efc396afa1f31cd8afedab356 (patch) | |
tree | e1dbc84262106d69a67c41a9fcd2117e834eaefe /drivers/media/i2c | |
parent | 320c63870941ef3bb6e08e979d894ad6d51340d7 (diff) |
[media] adv7180: free an interrupt on failure paths in init_device()
There is request_irq() in init_device(), but the interrupt is not removed
on failure paths. The patch adds proper error handling.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/i2c')
-rw-r--r-- | drivers/media/i2c/adv7180.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c index 9cfc9a3ab3cc..5e638b159452 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c | |||
@@ -561,40 +561,44 @@ static int init_device(struct i2c_client *client, struct adv7180_state *state) | |||
561 | ret = i2c_smbus_write_byte_data(client, ADV7180_ADI_CTRL_REG, | 561 | ret = i2c_smbus_write_byte_data(client, ADV7180_ADI_CTRL_REG, |
562 | ADV7180_ADI_CTRL_IRQ_SPACE); | 562 | ADV7180_ADI_CTRL_IRQ_SPACE); |
563 | if (ret < 0) | 563 | if (ret < 0) |
564 | return ret; | 564 | goto err; |
565 | 565 | ||
566 | /* config the Interrupt pin to be active low */ | 566 | /* config the Interrupt pin to be active low */ |
567 | ret = i2c_smbus_write_byte_data(client, ADV7180_ICONF1_ADI, | 567 | ret = i2c_smbus_write_byte_data(client, ADV7180_ICONF1_ADI, |
568 | ADV7180_ICONF1_ACTIVE_LOW | | 568 | ADV7180_ICONF1_ACTIVE_LOW | |
569 | ADV7180_ICONF1_PSYNC_ONLY); | 569 | ADV7180_ICONF1_PSYNC_ONLY); |
570 | if (ret < 0) | 570 | if (ret < 0) |
571 | return ret; | 571 | goto err; |
572 | 572 | ||
573 | ret = i2c_smbus_write_byte_data(client, ADV7180_IMR1_ADI, 0); | 573 | ret = i2c_smbus_write_byte_data(client, ADV7180_IMR1_ADI, 0); |
574 | if (ret < 0) | 574 | if (ret < 0) |
575 | return ret; | 575 | goto err; |
576 | 576 | ||
577 | ret = i2c_smbus_write_byte_data(client, ADV7180_IMR2_ADI, 0); | 577 | ret = i2c_smbus_write_byte_data(client, ADV7180_IMR2_ADI, 0); |
578 | if (ret < 0) | 578 | if (ret < 0) |
579 | return ret; | 579 | goto err; |
580 | 580 | ||
581 | /* enable AD change interrupts interrupts */ | 581 | /* enable AD change interrupts interrupts */ |
582 | ret = i2c_smbus_write_byte_data(client, ADV7180_IMR3_ADI, | 582 | ret = i2c_smbus_write_byte_data(client, ADV7180_IMR3_ADI, |
583 | ADV7180_IRQ3_AD_CHANGE); | 583 | ADV7180_IRQ3_AD_CHANGE); |
584 | if (ret < 0) | 584 | if (ret < 0) |
585 | return ret; | 585 | goto err; |
586 | 586 | ||
587 | ret = i2c_smbus_write_byte_data(client, ADV7180_IMR4_ADI, 0); | 587 | ret = i2c_smbus_write_byte_data(client, ADV7180_IMR4_ADI, 0); |
588 | if (ret < 0) | 588 | if (ret < 0) |
589 | return ret; | 589 | goto err; |
590 | 590 | ||
591 | ret = i2c_smbus_write_byte_data(client, ADV7180_ADI_CTRL_REG, | 591 | ret = i2c_smbus_write_byte_data(client, ADV7180_ADI_CTRL_REG, |
592 | 0); | 592 | 0); |
593 | if (ret < 0) | 593 | if (ret < 0) |
594 | return ret; | 594 | goto err; |
595 | } | 595 | } |
596 | 596 | ||
597 | return 0; | 597 | return 0; |
598 | |||
599 | err: | ||
600 | free_irq(state->irq, state); | ||
601 | return ret; | ||
598 | } | 602 | } |
599 | 603 | ||
600 | static int adv7180_probe(struct i2c_client *client, | 604 | static int adv7180_probe(struct i2c_client *client, |