From: Ricardo Ribalda <ribalda@chromium.org>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Guenter Roeck <linux@roeck-us.net>,
Max Staudt <mstaudt@chromium.org>,
Tomasz Figa <tfiga@chromium.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Alan Stern <stern@rowland.harvard.edu>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Sean Paul <seanpaul@chromium.org>,
Ricardo Ribalda <ribalda@chromium.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>
Subject: [PATCH v3 3/3] media: uvcvideo: Exit early if there is not int_urb
Date: Mon, 25 Mar 2024 16:31:35 +0000 [thread overview]
Message-ID: <20240325-guenter-mini-v3-3-c4bc61d84e03@chromium.org> (raw)
In-Reply-To: <20240325-guenter-mini-v3-0-c4bc61d84e03@chromium.org>
If there is no in_urb there is no need to do a clean stop.
Also we avoid calling usb_kill_urb(NULL). It is properly handled by the
usb framework, but it is not polite.
Now that we are at it, fix the code style in uvc_status_start() for
consistency.
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/usb/uvc/uvc_status.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c
index ff66482346dde..f644ac7e67427 100644
--- a/drivers/media/usb/uvc/uvc_status.c
+++ b/drivers/media/usb/uvc/uvc_status.c
@@ -308,7 +308,7 @@ static int _uvc_status_start(struct uvc_device *dev, gfp_t flags)
{
lockdep_assert_held(&dev->status_lock);
- if (dev->int_urb == NULL)
+ if (!dev->int_urb)
return 0;
return usb_submit_urb(dev->int_urb, flags);
@@ -320,6 +320,9 @@ static void _uvc_status_stop(struct uvc_device *dev)
lockdep_assert_held(&dev->status_lock);
+ if (!dev->int_urb)
+ return;
+
/*
* Prevent the asynchronous control handler from requeing the URB. The
* barrier is needed so the flush_status change is visible to other
--
2.44.0.396.g6e790dbe36-goog
next prev parent reply other threads:[~2024-03-25 16:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-25 16:31 [PATCH v3 0/3] uvcvideo: Attempt N to land UVC race conditions fixes Ricardo Ribalda
2024-03-25 16:31 ` [PATCH v3 1/3] media: uvcvideo: stop stream during unregister Ricardo Ribalda
2024-03-25 16:31 ` [PATCH v3 2/3] media: uvcvideo: Refactor the status irq API Ricardo Ribalda
2024-03-26 8:42 ` Sergey Senozhatsky
2024-03-26 8:49 ` Ricardo Ribalda
2024-03-26 8:59 ` Sergey Senozhatsky
2024-03-25 16:31 ` Ricardo Ribalda [this message]
2024-03-25 16:41 ` [PATCH v3 3/3] media: uvcvideo: Exit early if there is not int_urb Guenter Roeck
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=20240325-guenter-mini-v3-3-c4bc61d84e03@chromium.org \
--to=ribalda@chromium.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mchehab@kernel.org \
--cc=mstaudt@chromium.org \
--cc=sakari.ailus@linux.intel.com \
--cc=seanpaul@chromium.org \
--cc=stern@rowland.harvard.edu \
--cc=tfiga@chromium.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
all inboxes | Powered by JetHome®