summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLibin Yang <lbyang@marvell.com>2013-11-05 03:18:15 +0100
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-11-29 17:22:48 +0100
commitdff04d34b1171bc33e30ef391c2d2ce7be2beb98 (patch)
tree971c72f997aa5add1288e995d48a9460b44409f4 /drivers/media
parent[media] tef6862/radio-tea5764: actually assign clamp result (diff)
downloadlinux-dff04d34b1171bc33e30ef391c2d2ce7be2beb98.tar.xz
linux-dff04d34b1171bc33e30ef391c2d2ce7be2beb98.zip
[media] marvell-ccic: drop resource free in driver remove
The mmp-driver is using devm_* to allocate the resource. The old resource release methods are not appropriate here. Signed-off-by: Libin Yang <lbyang@marvell.com> Acked-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Cc: stable@vger.kernel.org # for v3.12 and up Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/marvell-ccic/mmp-driver.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/platform/marvell-ccic/mmp-driver.c b/drivers/media/platform/marvell-ccic/mmp-driver.c
index 3458fa0e2fd5..70cb57f3adc2 100644
--- a/drivers/media/platform/marvell-ccic/mmp-driver.c
+++ b/drivers/media/platform/marvell-ccic/mmp-driver.c
@@ -478,18 +478,11 @@ out_deinit_clk:
static int mmpcam_remove(struct mmp_camera *cam)
{
struct mcam_camera *mcam = &cam->mcam;
- struct mmp_camera_platform_data *pdata;
mmpcam_remove_device(cam);
mccic_shutdown(mcam);
mmpcam_power_down(mcam);
- pdata = cam->pdev->dev.platform_data;
- gpio_free(pdata->sensor_reset_gpio);
- gpio_free(pdata->sensor_power_gpio);
mcam_deinit_clk(mcam);
- iounmap(cam->power_regs);
- iounmap(mcam->regs);
- kfree(cam);
return 0;
}