projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f3e8e4f
)
[media] tvp514x: use devm_kzalloc() instead of kzalloc()
author
Lad, Prabhakar
<
[email protected]
>
Thu, 3 Jan 2013 13:04:57 +0000
(10:04 -0300)
committer
Mauro Carvalho Chehab
<
[email protected]
>
Tue, 5 Feb 2013 16:08:25 +0000
(14:08 -0200)
I2C drivers can use devm_kzalloc() too in their .probe() methods. Doing so
simplifies their clean up paths.
Signed-off-by: Lad, Prabhakar <
[email protected]
>
Signed-off-by: Manjunath Hadli <
[email protected]
>
Acked-by: Laurent Pinchart <
[email protected]
>
Signed-off-by: Mauro Carvalho Chehab <
[email protected]
>
drivers/media/i2c/tvp514x.c
patch
|
blob
|
history
diff --git
a/drivers/media/i2c/tvp514x.c
b/drivers/media/i2c/tvp514x.c
index d5e10215a28f46197d480aa51156cab605d7ef21..aa94ebc2d7552805a6be911f6912812ef73aada8 100644
(file)
--- 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)
return -ENODEV;
}
- decoder =
kzalloc(
sizeof(*decoder), GFP_KERNEL);
+ decoder =
devm_kzalloc(&client->dev,
sizeof(*decoder), GFP_KERNEL);
if (!decoder)
return -ENOMEM;
@@
-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);
@@
-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 */