[media] media: i2c: Convert to devm_kzalloc()
Using the managed function the kfree() calls can be removed from the probe error path and the remove handler. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:

committed by
Mauro Carvalho Chehab

parent
95323361e5
commit
c02b211df6
@@ -1262,7 +1262,7 @@ static int saa717x_probe(struct i2c_client *client,
|
||||
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
|
||||
return -EIO;
|
||||
|
||||
decoder = kzalloc(sizeof(struct saa717x_state), GFP_KERNEL);
|
||||
decoder = devm_kzalloc(&client->dev, sizeof(*decoder), GFP_KERNEL);
|
||||
if (decoder == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -1276,7 +1276,6 @@ static int saa717x_probe(struct i2c_client *client,
|
||||
id = saa717x_read(sd, 0x5a0);
|
||||
if (id != 0xc2 && id != 0x32 && id != 0xf2 && id != 0x6c) {
|
||||
v4l2_dbg(1, debug, sd, "saa717x not found (id=%02x)\n", id);
|
||||
kfree(decoder);
|
||||
return -ENODEV;
|
||||
}
|
||||
if (id == 0xc2)
|
||||
@@ -1316,7 +1315,6 @@ static int saa717x_probe(struct i2c_client *client,
|
||||
int err = hdl->error;
|
||||
|
||||
v4l2_ctrl_handler_free(hdl);
|
||||
kfree(decoder);
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -1353,7 +1351,6 @@ static int saa717x_remove(struct i2c_client *client)
|
||||
|
||||
v4l2_device_unregister_subdev(sd);
|
||||
v4l2_ctrl_handler_free(sd->ctrl_handler);
|
||||
kfree(to_state(sd));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user