1 files changed, 6 insertions, 10 deletions

diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
index 6c4444b31f4b..7d768ec0f824 100644
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
@@ -1,14 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright (c) 2017 Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version
- * 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Copyright (C) 2017 Intel Corporation
  *
  * Based partially on Intel IPU4 driver written by
  *  Sakari Ailus <sakari.ailus@linux.intel.com>
@@ -526,6 +518,8 @@ static void cio2_hw_exit(struct cio2_device *cio2, struct cio2_queue *q)
         unsigned int i, maxloops = 1000;
 
         /* Disable CSI receiver and MIPI backend devices */
+        writel(0, q->csi_rx_base + CIO2_REG_IRQCTRL_MASK);
+        writel(0, q->csi_rx_base + CIO2_REG_IRQCTRL_ENABLE);
         writel(0, q->csi_rx_base + CIO2_REG_CSIRX_ENABLE);
         writel(0, q->csi_rx_base + CIO2_REG_MIPIBE_ENABLE);
 
@@ -1035,6 +1029,7 @@ static void cio2_vb2_stop_streaming(struct vb2_queue *vq)
                         "failed to stop sensor streaming\n");
 
         cio2_hw_exit(cio2, q);
+        synchronize_irq(cio2->pci_dev->irq);
         cio2_vb2_return_all_buffers(q, VB2_BUF_STATE_ERROR);
         media_pipeline_stop(&q->vdev.entity);
         pm_runtime_put(&cio2->pci_dev->dev);
@@ -1976,6 +1971,7 @@ static int __maybe_unused cio2_suspend(struct device *dev)
 
         /* Stop stream */
         cio2_hw_exit(cio2, q);
+        synchronize_irq(pci_dev->irq);
 
         pm_runtime_force_suspend(dev);