aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/saa7191.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/saa7191.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/saa7191.c')
-rw-r--r--drivers/media/i2c/saa7191.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/i2c/saa7191.c b/drivers/media/i2c/saa7191.c
index d7d1670e0ca3..84f7899a4044 100644
--- a/drivers/media/i2c/saa7191.c
+++ b/drivers/media/i2c/saa7191.c
@@ -605,7 +605,7 @@ static int saa7191_probe(struct i2c_client *client,
605 v4l_info(client, "chip found @ 0x%x (%s)\n", 605 v4l_info(client, "chip found @ 0x%x (%s)\n",
606 client->addr << 1, client->adapter->name); 606 client->addr << 1, client->adapter->name);
607 607
608 decoder = kzalloc(sizeof(*decoder), GFP_KERNEL); 608 decoder = devm_kzalloc(&client->dev, sizeof(*decoder), GFP_KERNEL);
609 if (!decoder) 609 if (!decoder)
610 return -ENOMEM; 610 return -ENOMEM;
611 611
@@ -615,7 +615,6 @@ static int saa7191_probe(struct i2c_client *client,
615 err = saa7191_write_block(sd, sizeof(initseq), initseq); 615 err = saa7191_write_block(sd, sizeof(initseq), initseq);
616 if (err) { 616 if (err) {
617 printk(KERN_ERR "SAA7191 initialization failed\n"); 617 printk(KERN_ERR "SAA7191 initialization failed\n");
618 kfree(decoder);
619 return err; 618 return err;
620 } 619 }
621 620
@@ -636,7 +635,6 @@ static int saa7191_remove(struct i2c_client *client)
636 struct v4l2_subdev *sd = i2c_get_clientdata(client); 635 struct v4l2_subdev *sd = i2c_get_clientdata(client);
637 636
638 v4l2_device_unregister_subdev(sd); 637 v4l2_device_unregister_subdev(sd);
639 kfree(to_saa7191(sd));
640 return 0; 638 return 0;
641} 639}
642 640