openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Libin Yang 2013-11-04 23:18:15 -03:00 committed by Mauro Carvalho Chehab
parent a3d94dafbb
commit fe4a0f1c7d
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/platform/marvell-ccic/mmp-driver.c
View File

@ -478,18 +478,11 @@ static int mmpcam_probe(struct platform_device *pdev)
static int mmpcam_remove(struct mmp_camera *cam) static int mmpcam_remove(struct mmp_camera *cam)
{ {
struct mcam_camera *mcam = &cam->mcam; struct mcam_camera *mcam = &cam->mcam;
struct mmp_camera_platform_data *pdata;
mmpcam_remove_device(cam); mmpcam_remove_device(cam);
mccic_shutdown(mcam); mccic_shutdown(mcam);
mmpcam_power_down(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); mcam_deinit_clk(mcam);
iounmap(cam->power_regs);
iounmap(mcam->regs);
kfree(cam);
return 0; return 0;
} }