]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
media: atmel: atmel-sama7g5-isc: fix ispck leftover
authorEugen Hristev <eugen.hristev@microchip.com>
Mon, 13 Dec 2021 13:49:23 +0000 (14:49 +0100)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 12:38:10 +0000 (14:38 +0200)
BugLink: https://bugs.launchpad.net/bugs/1969110
[ Upstream commit 1b52ce99e9f2dcda868a1a7026bfb58d04bd6bc8 ]

The ispck is not used for sama7g5 variant of the ISC.
Calls to ispck have to be removed also from module insert/removal.

Fixes: d7f26849ed7c ("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>
(cherry picked from commit f7d07ad8bc03511fdff8a647f1767e2800dd8ad0)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/media/platform/atmel/atmel-sama7g5-isc.c

index 9c05acafd0724341f4491630751e4e79bd4822ca..6a5d3f7ce75e5e98514f118d5666740b05bfdd2e 100644 (file)
@@ -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;
 }