aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibin Yang <lbyang@marvell.com>2013-11-04 21:18:15 -0500
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-11-29 11:22:48 -0500
commitdff04d34b1171bc33e30ef391c2d2ce7be2beb98 (patch)
tree971c72f997aa5add1288e995d48a9460b44409f4
parent9ba6a91f19b8c118d11c549495fa4f7a20505d80 (diff)
[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>
-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:
478static int mmpcam_remove(struct mmp_camera *cam) 478static int mmpcam_remove(struct mmp_camera *cam)
479{ 479{
480 struct mcam_camera *mcam = &cam->mcam; 480 struct mcam_camera *mcam = &cam->mcam;
481 struct mmp_camera_platform_data *pdata;
482 481
483 mmpcam_remove_device(cam); 482 mmpcam_remove_device(cam);
484 mccic_shutdown(mcam); 483 mccic_shutdown(mcam);
485 mmpcam_power_down(mcam); 484 mmpcam_power_down(mcam);
486 pdata = cam->pdev->dev.platform_data;
487 gpio_free(pdata->sensor_reset_gpio);
488 gpio_free(pdata->sensor_power_gpio);
489 mcam_deinit_clk(mcam); 485 mcam_deinit_clk(mcam);
490 iounmap(cam->power_regs);
491 iounmap(mcam->regs);
492 kfree(cam);
493 return 0; 486 return 0;
494} 487}
495 488