Skip to content

Commit

Permalink
[media] tvp514x: use devm_kzalloc() instead of kzalloc()
Browse files Browse the repository at this point in the history
I2C drivers can use devm_kzalloc() too in their .probe() methods. Doing so
simplifies their clean up paths.

Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Lad, Prabhakar authored and Mauro Carvalho Chehab committed Feb 5, 2013
1 parent f3e8e4f commit 08754d3
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/media/i2c/tvp514x.c
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id)
return -ENODEV;
}

decoder = kzalloc(sizeof(*decoder), GFP_KERNEL);
decoder = devm_kzalloc(&client->dev, sizeof(*decoder), GFP_KERNEL);
if (!decoder)
return -ENOMEM;

Expand Down Expand Up @@ -998,7 +998,6 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id)
int err = decoder->hdl.error;

v4l2_ctrl_handler_free(&decoder->hdl);
kfree(decoder);
return err;
}
v4l2_ctrl_handler_setup(&decoder->hdl);
Expand All @@ -1023,7 +1022,6 @@ static int tvp514x_remove(struct i2c_client *client)

v4l2_device_unregister_subdev(sd);
v4l2_ctrl_handler_free(&decoder->hdl);
kfree(decoder);
return 0;
}
/* TVP5146 Init/Power on Sequence */
Expand Down

0 comments on commit 08754d3

Please sign in to comment.