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 <[email protected]>
---
 drivers/media/i2c/adv7180.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index d7d99f1c69e4..e462392ba043 100644
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -541,40 +541,44 @@ static int init_device(struct i2c_client *client, struct 
adv7180_state *state)
                ret = i2c_smbus_write_byte_data(client, ADV7180_ADI_CTRL_REG,
                                                ADV7180_ADI_CTRL_IRQ_SPACE);
                if (ret < 0)
-                       return ret;
+                       goto err;
 
                /* config the Interrupt pin to be active low */
                ret = i2c_smbus_write_byte_data(client, ADV7180_ICONF1_ADI,
                                                ADV7180_ICONF1_ACTIVE_LOW |
                                                ADV7180_ICONF1_PSYNC_ONLY);
                if (ret < 0)
-                       return ret;
+                       goto err;
 
                ret = i2c_smbus_write_byte_data(client, ADV7180_IMR1_ADI, 0);
                if (ret < 0)
-                       return ret;
+                       goto err;
 
                ret = i2c_smbus_write_byte_data(client, ADV7180_IMR2_ADI, 0);
                if (ret < 0)
-                       return ret;
+                       goto err;
 
                /* enable AD change interrupts interrupts */
                ret = i2c_smbus_write_byte_data(client, ADV7180_IMR3_ADI,
                                                ADV7180_IRQ3_AD_CHANGE);
                if (ret < 0)
-                       return ret;
+                       goto err;
 
                ret = i2c_smbus_write_byte_data(client, ADV7180_IMR4_ADI, 0);
                if (ret < 0)
-                       return ret;
+                       goto err;
 
                ret = i2c_smbus_write_byte_data(client, ADV7180_ADI_CTRL_REG,
                                                0);
                if (ret < 0)
-                       return ret;
+                       goto err;
        }
 
        return 0;
+
+err:
+       free_irq(state->irq, state);
+       return ret;
 }
 
 static int adv7180_probe(struct i2c_client *client,
-- 
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to