Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1660087

[PATCH v8 33/34] media: imx: Drop warning upon multiple S_STREAM disable calls

From Steve Longerbeam <slongerbeam@gmail.com>
Newsgroups linux.kernel
Subject [PATCH v8 33/34] media: imx: Drop warning upon multiple S_STREAM disable calls
Date 2017-06-07 20:40 +0200
Message-ID <tPO28-1PO-71@gated-at.bofh.it> (permalink)
References <tPO26-1PO-7@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

From: Marek Vasut <marex@denx.de>

Calling S_STREAM OFF multiple times on a video device is valid, although
dubious, practice. Instead of warning about it and setting stream count
lower than zero, just ignore the subsequent S_STREAM calls and correct
the stream count to zero.

Signed-off-by: Marek Vasut <marex@denx.de>
---
 drivers/staging/media/imx/imx-ic-prp.c      | 3 ++-
 drivers/staging/media/imx/imx-ic-prpencvf.c | 3 ++-
 drivers/staging/media/imx/imx-media-csi.c   | 3 ++-
 drivers/staging/media/imx/imx-media-vdic.c  | 3 ++-
 drivers/staging/media/imx/imx6-mipi-csi2.c  | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/media/imx/imx-ic-prp.c b/drivers/staging/media/imx/imx-ic-prp.c
index 783a515..c2bb5ef 100644
--- a/drivers/staging/media/imx/imx-ic-prp.c
+++ b/drivers/staging/media/imx/imx-ic-prp.c
@@ -391,7 +391,8 @@ static int prp_s_stream(struct v4l2_subdev *sd, int enable)
 
 update_count:
 	priv->stream_count += enable ? 1 : -1;
-	WARN_ON(priv->stream_count < 0);
+	if (priv->stream_count < 0)
+		priv->stream_count = 0;
 out:
 	mutex_unlock(&priv->lock);
 	return ret;
diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c
index 5e9c817..ed363fe 100644
--- a/drivers/staging/media/imx/imx-ic-prpencvf.c
+++ b/drivers/staging/media/imx/imx-ic-prpencvf.c
@@ -1140,7 +1140,8 @@ static int prp_s_stream(struct v4l2_subdev *sd, int enable)
 
 update_count:
 	priv->stream_count += enable ? 1 : -1;
-	WARN_ON(priv->stream_count < 0);
+	if (priv->stream_count < 0)
+		priv->stream_count = 0;
 out:
 	mutex_unlock(&priv->lock);
 	return ret;
diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index c6e8d2c..c306146 100644
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -863,7 +863,8 @@ static int csi_s_stream(struct v4l2_subdev *sd, int enable)
 
 update_count:
 	priv->stream_count += enable ? 1 : -1;
-	WARN_ON(priv->stream_count < 0);
+	if (priv->stream_count < 0)
+		priv->stream_count = 0;
 out:
 	mutex_unlock(&priv->lock);
 	return ret;
diff --git a/drivers/staging/media/imx/imx-media-vdic.c b/drivers/staging/media/imx/imx-media-vdic.c
index c0b6d7f..7eabdc4 100644
--- a/drivers/staging/media/imx/imx-media-vdic.c
+++ b/drivers/staging/media/imx/imx-media-vdic.c
@@ -536,7 +536,8 @@ static int vdic_s_stream(struct v4l2_subdev *sd, int enable)
 
 update_count:
 	priv->stream_count += enable ? 1 : -1;
-	WARN_ON(priv->stream_count < 0);
+	if (priv->stream_count < 0)
+		priv->stream_count = 0;
 out:
 	mutex_unlock(&priv->lock);
 	return ret;
diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/media/imx/imx6-mipi-csi2.c
index cae1cb2..5061f3f 100644
--- a/drivers/staging/media/imx/imx6-mipi-csi2.c
+++ b/drivers/staging/media/imx/imx6-mipi-csi2.c
@@ -397,7 +397,8 @@ static int csi2_s_stream(struct v4l2_subdev *sd, int enable)
 
 update_count:
 	csi2->stream_count += enable ? 1 : -1;
-	WARN_ON(csi2->stream_count < 0);
+	if (csi2->stream_count < 0)
+		csi2->stream_count = 0;
 out:
 	mutex_unlock(&csi2->lock);
 	return ret;
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v8 00/34] i.MX Media Driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 28/34] media: imx: csi: add frame skipping support Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 11/34] ARM: dts: imx6-sabreauto: create i2cmux for i2c3 Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 26/34] media: imx: csi: add support for bayer formats Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 31/34] media: imx: capture: add frame sizes/interval enumeration Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 25/34] media: imx: Add MIPI CSI-2 Receiver subdev driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 32/34] media: imx: set and propagate default field, colorimetry Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 33/34] media: imx: Drop warning upon multiple S_STREAM disable calls Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 30/34] media: imx: csi: add frame size/interval enumeration Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 16/34] platform: add video-multiplexer subdevice driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 09/34] ARM: dts: imx6-sabrelite: add OV5642 and OV5640 camera sensors Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 18/34] media: Add userspace header file for i.MX Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 07/34] ARM: dts: imx6qdl: add capture-subsystem device Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 15/34] add mux and video interface bridge entity functions Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 23/34] media: imx: Add VDIC subdev driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 04/34] ARM: dts: imx6qdl: add multiplexer controls Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 21/34] media: imx: Add Capture Device Interface Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 13/34] ARM: dts: imx6-sabreauto: add pinctrl for gpt input capture Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 06/34] ARM: dts: imx6qdl: Add video multiplexers, mipi_csi, and their connections Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 12/34] ARM: dts: imx6-sabreauto: add reset-gpios property for max7310_b Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 03/34] [media] dt/bindings: Add bindings for OV5640 Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 01/34] dt-bindings: Add bindings for video-multiplexer device Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  Re: [PATCH v8 00/34] i.MX Media Driver Hans Verkuil <hverkuil@xs4all.nl> - 2017-06-07 21:10 +0200
    Re: [PATCH v8 00/34] i.MX Media Driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 21:10 +0200
    Re: [PATCH v8 00/34] i.MX Media Driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-10 01:20 +0200
    Re: [PATCH v8 00/34] i.MX Media Driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-10 01:20 +0200
      Re: [PATCH v8 00/34] i.MX Media Driver Hans Verkuil <hverkuil@xs4all.nl> - 2017-06-10 01:30 +0200
        Re: [PATCH v8 00/34] i.MX Media Driver Pavel Machek <pavel@ucw.cz> - 2017-06-10 09:40 +0200
        Re: [PATCH v8 00/34] i.MX Media Driver Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> - 2017-06-11 22:10 +0200
          Re: [PATCH v8 00/34] i.MX Media Driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-12 20:20 +0200
  Re: [PATCH v8 19/34] media: Add i.MX media core driver Philipp Zabel <p.zabel@pengutronix.de> - 2017-06-09 15:20 +0200
    Re: [PATCH v8 19/34] media: Add i.MX media core driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-10 01:10 +0200
  Re: [PATCH v8 17/34] [media] add Omnivision OV5640 sensor driver Sakari Ailus <sakari.ailus@iki.fi> - 2017-06-11 00:00 +0200

csiph-web