diff options
| author | Libin Yang <lbyang@marvell.com> | 2013-11-05 06:18:15 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-11-29 20:22:48 +0400 |
| commit | dff04d34b1171bc33e30ef391c2d2ce7be2beb98 (patch) | |
| tree | 971c72f997aa5add1288e995d48a9460b44409f4 /drivers/media/platform/marvell-ccic/mmp-driver.c | |
| parent | 9ba6a91f19b8c118d11c549495fa4f7a20505d80 (diff) | |
| download | linux-dff04d34b1171bc33e30ef391c2d2ce7be2beb98.tar.xz | |
[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/platform/marvell-ccic/mmp-driver.c')
| -rw-r--r-- | drivers/media/platform/marvell-ccic/mmp-driver.c | 7 |
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; } |