From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Subject: [PATCH 1/7] omap3isp: Prevent enabling CCDC when stopping streaming
Date: Thu, 13 Feb 2020 11:49:28 +0200 [thread overview]
Message-ID: <20200213094934.18595-2-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20200213094934.18595-1-sakari.ailus@linux.intel.com>
Commit ... prevented restarting CCDC through its interrupt handler when
it's about to be disabled. It missed to address the case when CCDC might
be enabled due to queueing a buffer. Do that now.
Fixes: dd12ed17ce9e ("omap3isp: Don't restart CCDC if we're about to stop")
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/platform/omap3isp/ispccdc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c
index 471ae7cdb813..0fbb2aa6dd2c 100644
--- a/drivers/media/platform/omap3isp/ispccdc.c
+++ b/drivers/media/platform/omap3isp/ispccdc.c
@@ -1312,6 +1312,10 @@ static void __ccdc_enable(struct isp_ccdc_device *ccdc, int enable)
{
struct isp_device *isp = to_isp_device(ccdc);
+ /* Avoid restarting the CCDC when streaming is stopping. */
+ if (enable && ccdc->stopping & CCDC_STOP_REQUEST)
+ return;
+
isp_reg_clr_set(isp, OMAP3_ISP_IOMEM_CCDC, ISPCCDC_PCR,
ISPCCDC_PCR_EN, enable ? ISPCCDC_PCR_EN : 0);
--
2.20.1
next prev parent reply other threads:[~2020-02-13 9:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-13 9:49 [PATCH 0/7] smiapp, omap3isp: Cleanups and fixes Sakari Ailus
2020-02-13 9:49 ` Sakari Ailus [this message]
2020-02-13 9:49 ` [PATCH 2/7] smiapp: Simplify condition for choosing 8-bit access Sakari Ailus
2020-02-13 9:49 ` [PATCH 3/7] smiapp: Use unaligned get and put functions Sakari Ailus
2020-02-13 9:49 ` [PATCH 4/7] smiapp: Turn limit lookup into a function Sakari Ailus
2020-02-13 9:49 ` [PATCH 5/7] smiapp: Move SMIA limit reading up Sakari Ailus
2020-02-13 9:49 ` [PATCH 6/7] smiapp: Refactor reading SMIA limits Sakari Ailus
2020-02-13 9:49 ` [PATCH 7/7] smiapp: Move definitions under driver directory Sakari Ailus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200213094934.18595-2-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).