summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2021-08-21 13:12:53 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2021-09-30 10:07:55 +0200
commit5c47dc6657543b3c4dffcbe741fb693b9b96796d (patch)
tree3d76a40d3c5a46540d6ea4d88c468533a7065d8c /drivers/media/platform
parent2143ad413c05c7be24c3a92760e367b7f6aaac92 (diff)
downloadlinux-stable-5c47dc6657543b3c4dffcbe741fb693b9b96796d.tar.gz
linux-stable-5c47dc6657543b3c4dffcbe741fb693b9b96796d.tar.bz2
linux-stable-5c47dc6657543b3c4dffcbe741fb693b9b96796d.zip
media: imx-jpeg: Fix the error handling path of 'mxc_jpeg_probe()'
A successful 'mxc_jpeg_attach_pm_domains()' call should be balanced by a corresponding 'mxc_jpeg_detach_pm_domains()' call in the error handling path of the probe, as already done in the remove function. Update the error handling path accordingly. Fixes: 2db16c6ed72c ("media: imx-jpeg: Add V4L2 driver for i.MX8 JPEG Encoder/Decoder") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/imx-jpeg/mxc-jpeg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/imx-jpeg/mxc-jpeg.c
index b3cc5199ef28..73e73b6f2e5b 100644
--- a/drivers/media/platform/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/imx-jpeg/mxc-jpeg.c
@@ -2086,6 +2086,8 @@ err_m2m:
v4l2_device_unregister(&jpeg->v4l2_dev);
err_register:
+ mxc_jpeg_detach_pm_domains(jpeg);
+
err_irq:
return ret;
}