diff --git a/MAINTAINERS b/MAINTAINERS
index dc2fc3eb556b..29e2729008d9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11740,6 +11740,15 @@ T:	git git://linuxtv.org/media_tree.git
 F:	Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
 F:	drivers/media/platform/stm32/stm32-dcmi.c
 
+MEDIA DRIVERS FOR STM32 - DCMIPP
+M:	Hugues Fruchet <hugues.fruchet@foss.st.com>
+M:	Alain Volmat <alain.volmat@foss.st.com>
+L:	linux-media@vger.kernel.org
+S:	Supported
+T:	git git://linuxtv.org/media_tree.git
+F:	Documentation/devicetree/bindings/media/st,stm32-dcmipp.yaml
+F:	drivers/media/platform/stm32/stm32-dcmipp/*
+
 MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 M:	Mauro Carvalho Chehab <mchehab@kernel.org>
 L:	linux-media@vger.kernel.org
diff --git a/drivers/media/platform/stm32/stm32-dcmipp/dcmipp-core.c b/drivers/media/platform/stm32/stm32-dcmipp/dcmipp-core.c
index 38b6eaaf1af5..7935ee3ead71 100644
--- a/drivers/media/platform/stm32/stm32-dcmipp/dcmipp-core.c
+++ b/drivers/media/platform/stm32/stm32-dcmipp/dcmipp-core.c
@@ -48,7 +48,6 @@ struct dcmipp_device {
 	/* Hardware resources */
 	struct reset_control		*rstc;
 	void __iomem			*regs;
-	struct clk			*mclk;
 	struct clk			*kclk;
 
 	/* The pipeline configuration */
@@ -621,7 +620,6 @@ static __maybe_unused int dcmipp_runtime_suspend(struct device *dev)
 	struct dcmipp_device *dcmipp = dev_get_drvdata(dev);
 
 	clk_disable_unprepare(dcmipp->kclk);
-	clk_disable_unprepare(dcmipp->mclk);
 
 	return 0;
 }
@@ -631,10 +629,6 @@ static __maybe_unused int dcmipp_runtime_resume(struct device *dev)
 	struct dcmipp_device *dcmipp = dev_get_drvdata(dev);
 	int ret;
 
-	ret = clk_prepare_enable(dcmipp->mclk);
-	if (ret)
-		dev_err(dev, "%s: Failed to prepare_enable clock\n", __func__);
-
 	ret = clk_prepare_enable(dcmipp->kclk);
 	if (ret)
 		dev_err(dev, "%s: Failed to prepare_enable k clock\n", __func__);
diff --git a/drivers/media/platform/stm32/stm32-dcmipp/dcmipp-parallel.c b/drivers/media/platform/stm32/stm32-dcmipp/dcmipp-parallel.c
index d123f64e9e7a..b2069bc538ac 100644
--- a/drivers/media/platform/stm32/stm32-dcmipp/dcmipp-parallel.c
+++ b/drivers/media/platform/stm32/stm32-dcmipp/dcmipp-parallel.c
@@ -234,7 +234,7 @@ static void dcmipp_par_adjust_fmt(struct dcmipp_par_device *par,
 		fmt->code = fmt_default.code;
 
 	/* Exclude JPEG if BT656 bus is selected */
-	if (vpix->code_sink == MEDIA_BUS_FMT_JPEG_1X8 &&
+	if (vpix && vpix->code_sink == MEDIA_BUS_FMT_JPEG_1X8 &&
 	    par->ved.bus_type == V4L2_MBUS_BT656)
 		fmt->code = fmt_default.code;