diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2013-05-02 07:29:43 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-05-21 06:52:15 -0400 |
commit | c02b211df6fc54e51ee554c27a6736a11255a764 (patch) | |
tree | a2b78b3a7a0400550fdd89da110d1b21a9e1acb1 /drivers/media/i2c/tw9903.c | |
parent | 95323361e5313733a54771c5059f5b352adbf32c (diff) |
[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>
Diffstat (limited to 'drivers/media/i2c/tw9903.c')
-rw-r--r-- | drivers/media/i2c/tw9903.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/i2c/tw9903.c b/drivers/media/i2c/tw9903.c index 87880b19d8c3..285b759a5f7f 100644 --- a/drivers/media/i2c/tw9903.c +++ b/drivers/media/i2c/tw9903.c | |||
@@ -215,7 +215,7 @@ static int tw9903_probe(struct i2c_client *client, | |||
215 | v4l_info(client, "chip found @ 0x%02x (%s)\n", | 215 | v4l_info(client, "chip found @ 0x%02x (%s)\n", |
216 | client->addr << 1, client->adapter->name); | 216 | client->addr << 1, client->adapter->name); |
217 | 217 | ||
218 | dec = kzalloc(sizeof(struct tw9903), GFP_KERNEL); | 218 | dec = devm_kzalloc(&client->dev, sizeof(*dec), GFP_KERNEL); |
219 | if (dec == NULL) | 219 | if (dec == NULL) |
220 | return -ENOMEM; | 220 | return -ENOMEM; |
221 | sd = &dec->sd; | 221 | sd = &dec->sd; |
@@ -233,7 +233,6 @@ static int tw9903_probe(struct i2c_client *client, | |||
233 | int err = hdl->error; | 233 | int err = hdl->error; |
234 | 234 | ||
235 | v4l2_ctrl_handler_free(hdl); | 235 | v4l2_ctrl_handler_free(hdl); |
236 | kfree(dec); | ||
237 | return err; | 236 | return err; |
238 | } | 237 | } |
239 | 238 | ||
@@ -242,7 +241,6 @@ static int tw9903_probe(struct i2c_client *client, | |||
242 | 241 | ||
243 | if (write_regs(sd, initial_registers) < 0) { | 242 | if (write_regs(sd, initial_registers) < 0) { |
244 | v4l2_err(client, "error initializing TW9903\n"); | 243 | v4l2_err(client, "error initializing TW9903\n"); |
245 | kfree(dec); | ||
246 | return -EINVAL; | 244 | return -EINVAL; |
247 | } | 245 | } |
248 | 246 | ||
@@ -255,7 +253,6 @@ static int tw9903_remove(struct i2c_client *client) | |||
255 | 253 | ||
256 | v4l2_device_unregister_subdev(sd); | 254 | v4l2_device_unregister_subdev(sd); |
257 | v4l2_ctrl_handler_free(&to_state(sd)->hdl); | 255 | v4l2_ctrl_handler_free(&to_state(sd)->hdl); |
258 | kfree(to_state(sd)); | ||
259 | return 0; | 256 | return 0; |
260 | } | 257 | } |
261 | 258 | ||