| Message ID | 20240325-guenter-mini-v3-3-c4bc61d84e03@chromium.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | uvcvideo: Attempt N to land UVC race conditions fixes | expand |
On 3/25/24 09:31, Ricardo Ribalda wrote: > If there is no in_urb there is no need to do a clean stop. > Nit: int_urb Guenter > 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 >
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
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(-)