Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Dean Anderson and committed by
Mauro Carvalho Chehab
00865fe6 ca7a722d

+2 -7
+2 -7
drivers/media/usb/s2255/s2255drv.c
··· 1 1 /* 2 2 * s2255drv.c - a driver for the Sensoray 2255 USB video capture device 3 3 * 4 - * Copyright (C) 2007-2010 by Sensoray Company Inc. 4 + * Copyright (C) 2007-2013 by Sensoray Company Inc. 5 5 * Dean Anderson 6 6 * 7 7 * Some video buffer code based on vivi driver: ··· 52 52 #include <media/v4l2-ctrls.h> 53 53 #include <media/v4l2-event.h> 54 54 55 - #define S2255_VERSION "1.22.1" 55 + #define S2255_VERSION "1.23.1" 56 56 #define FIRMWARE_FILE_NAME "f2255usb.bin" 57 57 58 58 /* default JPEG quality */ ··· 1303 1303 int ret = 0; 1304 1304 1305 1305 mutex_lock(&q->vb_lock); 1306 - if (videobuf_queue_is_busy(q)) { 1307 - dprintk(1, "queue busy\n"); 1308 - ret = -EBUSY; 1309 - goto out_s_std; 1310 - } 1311 1306 if (res_locked(fh)) { 1312 1307 dprintk(1, "can't change standard after started\n"); 1313 1308 ret = -EBUSY;