aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/vpx3220.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2013-05-02 07:29:43 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-05-21 06:52:15 -0400
commitc02b211df6fc54e51ee554c27a6736a11255a764 (patch)
treea2b78b3a7a0400550fdd89da110d1b21a9e1acb1 /drivers/media/i2c/vpx3220.c
parent95323361e5313733a54771c5059f5b352adbf32c (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/vpx3220.c')
-rw-r--r--drivers/media/i2c/vpx3220.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/i2c/vpx3220.c b/drivers/media/i2c/vpx3220.c
index 2f67b4c5c823..f02e74b9b1ac 100644
--- a/drivers/media/i2c/vpx3220.c
+++ b/drivers/media/i2c/vpx3220.c
@@ -499,7 +499,7 @@ static int vpx3220_probe(struct i2c_client *client,
499 I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA)) 499 I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA))
500 return -ENODEV; 500 return -ENODEV;
501 501
502 decoder = kzalloc(sizeof(struct vpx3220), GFP_KERNEL); 502 decoder = devm_kzalloc(&client->dev, sizeof(*decoder), GFP_KERNEL);
503 if (decoder == NULL) 503 if (decoder == NULL)
504 return -ENOMEM; 504 return -ENOMEM;
505 sd = &decoder->sd; 505 sd = &decoder->sd;
@@ -521,7 +521,6 @@ static int vpx3220_probe(struct i2c_client *client,
521 int err = decoder->hdl.error; 521 int err = decoder->hdl.error;
522 522
523 v4l2_ctrl_handler_free(&decoder->hdl); 523 v4l2_ctrl_handler_free(&decoder->hdl);
524 kfree(decoder);
525 return err; 524 return err;
526 } 525 }
527 v4l2_ctrl_handler_setup(&decoder->hdl); 526 v4l2_ctrl_handler_setup(&decoder->hdl);
@@ -566,7 +565,7 @@ static int vpx3220_remove(struct i2c_client *client)
566 565
567 v4l2_device_unregister_subdev(sd); 566 v4l2_device_unregister_subdev(sd);
568 v4l2_ctrl_handler_free(&decoder->hdl); 567 v4l2_ctrl_handler_free(&decoder->hdl);
569 kfree(decoder); 568
570 return 0; 569 return 0;
571} 570}
572 571