[media] adv7180: free an interrupt on failure paths in init_device()
authorAlexey Khoroshilov <khoroshilov@ispras.ru>
Fri, 14 Mar 2014 21:04:03 +0000 (18:04 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Mon, 24 Mar 2014 20:23:09 +0000 (17:23 -0300)
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>
drivers/media/i2c/adv7180.c

index 9cfc9a3..5e638b1 100644 (file)
@@ -561,40 +561,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,