mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 19:08:57 +09:00
media: atmel: atmel-sama7g5-isc: fix ispck leftover
[ Upstream commit1b52ce99e9] The ispck is not used for sama7g5 variant of the ISC. Calls to ispck have to be removed also from module insert/removal. Fixes:d7f26849ed("media: atmel: fix the ispck initialization") Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
25b925f94a
commit
f7d07ad8bc
@@ -555,7 +555,6 @@ static int microchip_xisc_remove(struct platform_device *pdev)
|
||||
|
||||
v4l2_device_unregister(&isc->v4l2_dev);
|
||||
|
||||
clk_disable_unprepare(isc->ispck);
|
||||
clk_disable_unprepare(isc->hclock);
|
||||
|
||||
isc_clk_cleanup(isc);
|
||||
@@ -567,7 +566,6 @@ static int __maybe_unused xisc_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct isc_device *isc = dev_get_drvdata(dev);
|
||||
|
||||
clk_disable_unprepare(isc->ispck);
|
||||
clk_disable_unprepare(isc->hclock);
|
||||
|
||||
return 0;
|
||||
@@ -582,10 +580,6 @@ static int __maybe_unused xisc_runtime_resume(struct device *dev)
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = clk_prepare_enable(isc->ispck);
|
||||
if (ret)
|
||||
clk_disable_unprepare(isc->hclock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user