Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00865fe6 authored by Dean Anderson's avatar Dean Anderson Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarDean Anderson <linux-dev@sensoray.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent ca7a722d

drivers/media/usb/s2255/s2255drv.c

+2 −7
Original line number Diff line number Diff line 
/*

 *  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

 *

 * Some video buffer code based on vivi driver:
@@ -52,7 +52,7 @@ 
#include <media/v4l2-ctrls.h>

#include <media/v4l2-event.h>



#define S2255_VERSION		"1.22.1"

#define S2255_VERSION		"1.23.1"

#define FIRMWARE_FILE_NAME "f2255usb.bin"



/* default JPEG quality */
@@ -1303,11 +1303,6 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id i) 
	int ret = 0;



	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)) {

		dprintk(1, "can't change standard after started\n");

		ret = -EBUSY;