From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pf0-f180.google.com ([209.85.192.180]:35457 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755539AbcKVPws (ORCPT ); Tue, 22 Nov 2016 10:52:48 -0500 Received: by mail-pf0-f180.google.com with SMTP id i88so4808655pfk.2 for ; Tue, 22 Nov 2016 07:52:48 -0800 (PST) From: Kevin Hilman To: linux-media@vger.kernel.org, Hans Verkuil Cc: devicetree@vger.kernel.org, Sekhar Nori , Axel Haslam , =?UTF-8?q?Bartosz=20Go=C5=82aszewski?= , Alexandre Bailon , David Lechner Subject: [PATCH v3 2/4] [media] davinci: vpif_capture: don't lock over s_stream Date: Tue, 22 Nov 2016 07:52:42 -0800 Message-Id: <20161122155244.802-3-khilman@baylibre.com> In-Reply-To: <20161122155244.802-1-khilman@baylibre.com> References: <20161122155244.802-1-khilman@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org List-ID: Video capture subdevs may be over I2C and may sleep during xfer, so we cannot do IRQ-disabled locking when calling the subdev. Signed-off-by: Kevin Hilman --- drivers/media/platform/davinci/vpif_capture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index 87ee1e2c3864..94ee6cf03f02 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -193,7 +193,10 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count) } } + spin_unlock_irqrestore(&common->irqlock, flags); ret = v4l2_subdev_call(ch->sd, video, s_stream, 1); + spin_lock_irqsave(&common->irqlock, flags); + if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV) { vpif_dbg(1, debug, "stream on failed in subdev\n"); goto err; -- 2.9.3