Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dff04d34 authored by Libin Yang's avatar Libin Yang Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarLibin Yang <lbyang@marvell.com>
Acked-by: default avatarJonathan Corbet <corbet@lwn.net>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Cc: stable@vger.kernel.org      # for v3.12 and up
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 9ba6a91f

drivers/media/platform/marvell-ccic/mmp-driver.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -478,18 +478,11 @@ out_deinit_clk: 
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;

}

}