diff options
| author | Lad, Prabhakar <prabhakar.lad@ti.com> | 2013-01-03 08:04:57 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-05 11:08:25 -0500 |
| commit | 08754d3185fb7a95b24ae2a5e143f457f556da77 (patch) | |
| tree | 891967025fcafb018f82c4f608796fd6474e18ae | |
| parent | f3e8e4f1c039b13644f06c74cc5507bebc41da69 (diff) | |
[media] tvp514x: use devm_kzalloc() instead of kzalloc()
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>
| -rw-r--r-- | drivers/media/i2c/tvp514x.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c index d5e10215a28f..aa94ebc2d755 100644 --- a/drivers/media/i2c/tvp514x.c +++ b/drivers/media/i2c/tvp514x.c | |||
| @@ -951,7 +951,7 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
| 951 | return -ENODEV; | 951 | return -ENODEV; |
| 952 | } | 952 | } |
| 953 | 953 | ||
| 954 | decoder = kzalloc(sizeof(*decoder), GFP_KERNEL); | 954 | decoder = devm_kzalloc(&client->dev, sizeof(*decoder), GFP_KERNEL); |
| 955 | if (!decoder) | 955 | if (!decoder) |
| 956 | return -ENOMEM; | 956 | return -ENOMEM; |
| 957 | 957 | ||
| @@ -998,7 +998,6 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
| 998 | int err = decoder->hdl.error; | 998 | int err = decoder->hdl.error; |
| 999 | 999 | ||
| 1000 | v4l2_ctrl_handler_free(&decoder->hdl); | 1000 | v4l2_ctrl_handler_free(&decoder->hdl); |
| 1001 | kfree(decoder); | ||
| 1002 | return err; | 1001 | return err; |
| 1003 | } | 1002 | } |
| 1004 | v4l2_ctrl_handler_setup(&decoder->hdl); | 1003 | v4l2_ctrl_handler_setup(&decoder->hdl); |
| @@ -1023,7 +1022,6 @@ static int tvp514x_remove(struct i2c_client *client) | |||
| 1023 | 1022 | ||
| 1024 | v4l2_device_unregister_subdev(sd); | 1023 | v4l2_device_unregister_subdev(sd); |
| 1025 | v4l2_ctrl_handler_free(&decoder->hdl); | 1024 | v4l2_ctrl_handler_free(&decoder->hdl); |
| 1026 | kfree(decoder); | ||
| 1027 | return 0; | 1025 | return 0; |
| 1028 | } | 1026 | } |
| 1029 | /* TVP5146 Init/Power on Sequence */ | 1027 | /* TVP5146 Init/Power on Sequence */ |