From patchwork Wed Jul 17 08:43:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 2828493 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CF84A9F9F9 for ; Wed, 17 Jul 2013 08:43:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2AB122016D for ; Wed, 17 Jul 2013 08:43:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B5D262016C for ; Wed, 17 Jul 2013 08:43:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752815Ab3GQIn2 (ORCPT ); Wed, 17 Jul 2013 04:43:28 -0400 Received: from mail.free-electrons.com ([94.23.35.102]:49292 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752645Ab3GQInZ (ORCPT ); Wed, 17 Jul 2013 04:43:25 -0400 Received: by mail.free-electrons.com (Postfix, from userid 106) id 1B39FBAE; Wed, 17 Jul 2013 10:43:22 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from localhost.localdomain (unknown [190.2.109.25]) by mail.free-electrons.com (Postfix) with ESMTPA id 57981835; Wed, 17 Jul 2013 10:43:20 +0200 (CEST) From: Ezequiel Garcia To: Cc: Ezequiel Garcia , Sergey 'Jin' Bostandzhyan , Hans Verkuil Subject: [PATCH] stk1160: Allow to change input while streaming Date: Wed, 17 Jul 2013 05:43:22 -0300 Message-Id: <1374050602-2516-1-git-send-email-ezequiel.garcia@free-electrons.com> X-Mailer: git-send-email 1.8.1.5 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove the check as there's no reason to prevent the input from being set when the device is streaming. This allows surveillance applications (such as motion, zoneminder, etc.) to configure the input while streaming. Reported-by: Sergey 'Jin' Bostandzhyan Signed-off-by: Ezequiel Garcia --- Cc: Sergey 'Jin' Bostandzhyan Cc: Hans Verkuil drivers/media/usb/stk1160/stk1160-v4l.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c index 876fc26..ee46d82 100644 --- a/drivers/media/usb/stk1160/stk1160-v4l.c +++ b/drivers/media/usb/stk1160/stk1160-v4l.c @@ -440,9 +440,6 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i) { struct stk1160 *dev = video_drvdata(file); - if (vb2_is_busy(&dev->vb_vidq)) - return -EBUSY; - if (i > STK1160_MAX_INPUT) return -EINVAL;