diff options
| author | Corentin Labbe <clabbe@baylibre.com> | 2020-09-25 21:30:37 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-10-01 10:48:42 +0300 |
| commit | 6d1d9ba2c4396f42a134381a5bdfa0d5a416097c (patch) | |
| tree | dfe83735702bcc1b161bd0b6e34b00fdb028190e /drivers/staging | |
| parent | ce72671d5d2d93ee499c4a816760bc0b2f300559 (diff) | |
| download | linux-6d1d9ba2c4396f42a134381a5bdfa0d5a416097c.tar.xz | |
media: zoran: convert zoran alloc to devm
Allocate the zoran structure with devm_ functions permit to simplify
code.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/media/zoran/zoran_card.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/staging/media/zoran/zoran_card.c index 706b040f5baa..fe0c5a7c967c 100644 --- a/drivers/staging/media/zoran/zoran_card.c +++ b/drivers/staging/media/zoran/zoran_card.c @@ -1024,7 +1024,6 @@ static void zoran_remove(struct pci_dev *pdev) exit_free: v4l2_ctrl_handler_free(&zr->hdl); v4l2_device_unregister(&zr->v4l2_dev); - kfree(zr); } void zoran_vdev_release(struct video_device *vdev) @@ -1109,7 +1108,7 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return -ENOENT; } - zr = kzalloc(sizeof(*zr), GFP_KERNEL); + zr = devm_kzalloc(&pdev->dev, sizeof(*zr), GFP_KERNEL); if (!zr) return -ENOMEM; @@ -1298,7 +1297,6 @@ zr_unreg: v4l2_ctrl_handler_free(&zr->hdl); v4l2_device_unregister(&zr->v4l2_dev); zr_free_mem: - kfree(zr); return -ENODEV; } |