hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] S2255: Removal of unnecessary videobuf_queue_is_busy 

Removes unnecessary query of buffer state.  The code already checks if stream is active or not.

Signed-off-by: Dean Anderson <linux-dev@sensoray.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Dean Anderson 2013-07-23 18:06:41 -03:00 committed by Mauro Carvalho Chehab
parent ca7a722db1
commit 00865fe61e
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/usb/s2255/s2255drv.c
View File

@ -1,7 +1,7 @@
/* /*
* s2255drv.c - a driver for the Sensoray 2255 USB video capture device * s2255drv.c - a driver for the Sensoray 2255 USB video capture device
* *
* Copyright (C) 2007-2010 by Sensoray Company Inc. * Copyright (C) 2007-2013 by Sensoray Company Inc.
* Dean Anderson * Dean Anderson
* *
* Some video buffer code based on vivi driver: * Some video buffer code based on vivi driver:
@ -52,7 +52,7 @@
#include <media/v4l2-ctrls.h> #include <media/v4l2-ctrls.h>
#include <media/v4l2-event.h> #include <media/v4l2-event.h>
#define S2255_VERSION "1.22.1" #define S2255_VERSION "1.23.1"
#define FIRMWARE_FILE_NAME "f2255usb.bin" #define FIRMWARE_FILE_NAME "f2255usb.bin"
/* default JPEG quality */ /* default JPEG quality */
@ -1303,11 +1303,6 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id i)
int ret = 0; int ret = 0;
mutex_lock(&q->vb_lock); mutex_lock(&q->vb_lock);
if (videobuf_queue_is_busy(q)) {
dprintk(1, "queue busy\n");
ret = -EBUSY;
goto out_s_std;
}
if (res_locked(fh)) { if (res_locked(fh)) {
dprintk(1, "can't change standard after started\n"); dprintk(1, "can't change standard after started\n");
ret = -EBUSY; ret = -EBUSY;