From patchwork Fri Jan 4 20:59:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 16125 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TrENx-0007lL-Ba; Fri, 04 Jan 2013 22:01:01 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp id 1TrENw-0005Eg-Fc; Fri, 04 Jan 2013 22:01:01 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755244Ab3ADVAr (ORCPT + 1 other); Fri, 4 Jan 2013 16:00:47 -0500 Received: from mail-vc0-f179.google.com ([209.85.220.179]:62407 "EHLO mail-vc0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755041Ab3ADVAC (ORCPT ); Fri, 4 Jan 2013 16:00:02 -0500 Received: by mail-vc0-f179.google.com with SMTP id p1so16676881vcq.24 for ; Fri, 04 Jan 2013 13:00:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=yR2ZgzgQBiom51okeea0g2vbiye3RpcBgK4iTmIdON0=; b=Ao/QHlXwDt+ekhOMHtPZ9XcrQ/buQgHyQm2GKQ31oa9ihFdScMUs9nWiq00l5uvWSf GzWQv3/1e2B+Pzc06escHwBUaFPPzlFAbmxtdPhvSAK9ajHsrROZ7JaDgYJ3lWD3i8gQ 8+S7W9e47AFKYt9SlQ3GJQidK5Osnj8A/QHqZmzpOX+SR3Dq89F0CwrONtEdpO57XtnC XuYvc7fRLqC336Q8MBvYKljYW9n4XvqirlK4F/8STasyHJEhPDC0y00rb/oIz0h+T+NC I5dPMnoQDEzsu0w73xIFiOx79C3MS12Sfa2gDwxtux4kuzNLMSbmRjWpxy5zct9zbszz I+kw== X-Received: by 10.58.221.130 with SMTP id qe2mr80480862vec.14.1357333201320; Fri, 04 Jan 2013 13:00:01 -0800 (PST) Received: from devin-ubuntu2.home (pool-108-54-72-165.nycmny.fios.verizon.net. [108.54.72.165]) by mx.google.com with ESMTPS id z20sm47278440vds.12.2013.01.04.13.00.00 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 Jan 2013 13:00:00 -0800 (PST) From: Devin Heitmueller To: linux-media@vger.kernel.org Cc: Devin Heitmueller , Hans Verkuil Subject: [PATCH 09/15] em28xx: fill in readbuffers and fix incorrect return code. Date: Fri, 4 Jan 2013 15:59:39 -0500 Message-Id: <1357333186-8466-10-git-send-email-dheitmueller@kernellabs.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1357333186-8466-1-git-send-email-dheitmueller@kernellabs.com> References: <1357333186-8466-1-git-send-email-dheitmueller@kernellabs.com> X-Gm-Message-State: ALoCoQk50K2NOT/3JPi4b7nE5S61FfwPeIYUMqAYK2VXS8bL179AerUsEwOeEQZJtIiMFTUG2Fit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.1.4.204815 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1400_1499 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' g/s_parm should fill in readbuffers. For non-webcams s_parm should return -ENOTTY instead of -EINVAL. Signed-off-by: Hans Verkuil Signed-off-by: Devin Heitmueller --- drivers/media/usb/em28xx/em28xx-video.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index acdb434..a91a248 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c @@ -972,6 +972,7 @@ static int vidioc_g_parm(struct file *file, void *priv, if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) return -EINVAL; + p->parm.capture.readbuffers = EM28XX_MIN_BUF; if (dev->board.is_webcam) rc = v4l2_device_call_until_err(&dev->v4l2_dev, 0, video, g_parm, p); @@ -989,11 +990,12 @@ static int vidioc_s_parm(struct file *file, void *priv, struct em28xx *dev = fh->dev; if (!dev->board.is_webcam) - return -EINVAL; + return -ENOTTY; if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) return -EINVAL; + p->parm.capture.readbuffers = EM28XX_MIN_BUF; return v4l2_device_call_until_err(&dev->v4l2_dev, 0, video, s_parm, p); }