From patchwork Thu Mar 26 09:21:44 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Philipp Zabel
X-Patchwork-Id: 6097201
Return-Path:
X-Original-To: patchwork-linux-media@patchwork.kernel.org
Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org
Received: from mail.kernel.org (mail.kernel.org [198.145.29.136])
by patchwork2.web.kernel.org (Postfix) with ESMTP id 41300BF90F
for ;
Thu, 26 Mar 2015 09:21:52 +0000 (UTC)
Received: from mail.kernel.org (localhost [127.0.0.1])
by mail.kernel.org (Postfix) with ESMTP id 8183E203E5
for ;
Thu, 26 Mar 2015 09:21:51 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
by mail.kernel.org (Postfix) with ESMTP id A3DF5203C3
for ;
Thu, 26 Mar 2015 09:21:50 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1751628AbbCZJVs (ORCPT
);
Thu, 26 Mar 2015 05:21:48 -0400
Received: from metis.ext.pengutronix.de ([92.198.50.35]:48075 "EHLO
metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1751184AbbCZJVq (ORCPT
);
Thu, 26 Mar 2015 05:21:46 -0400
Received: from dude.hi.4.pengutronix.de ([10.1.0.7]
helo=dude.pengutronix.de.)
by metis.ext.pengutronix.de with esmtp (Exim 4.72)
(envelope-from )
id 1Yb3yz-0006Cx-Ia; Thu, 26 Mar 2015 10:21:45 +0100
From: Philipp Zabel
To: linux-media@vger.kernel.org
Cc: Hans Verkuil ,
Philipp Zabel
Subject: [RFC] v4l2-ctl: don't exit on VIDIOC_QUERYCAP error for subdevices
Date: Thu, 26 Mar 2015 10:21:44 +0100
Message-Id: <1427361704-32456-1-git-send-email-p.zabel@pengutronix.de>
X-Mailer: git-send-email 2.1.4
X-SA-Exim-Connect-IP: 10.1.0.7
X-SA-Exim-Mail-From: p.zabel@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de);
SAEximRunCond expanded to false
X-PTX-Original-Recipient: linux-media@vger.kernel.org
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID:
X-Mailing-List: linux-media@vger.kernel.org
X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI,
T_RP_MATCHES_RCVD,
UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP
Subdevice nodes don't implement VIDIOC_QUERYCAP. This check doesn't
allow any operations on v42-subdev nodes, such as setting EDID.
Signed-off-by: Philipp Zabel
---
utils/v4l2-ctl/v4l2-ctl.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/utils/v4l2-ctl/v4l2-ctl.cpp b/utils/v4l2-ctl/v4l2-ctl.cpp
index b340af7..211372b 100644
--- a/utils/v4l2-ctl/v4l2-ctl.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl.cpp
@@ -1149,10 +1149,7 @@ int main(int argc, char **argv)
}
verbose = options[OptVerbose];
- if (doioctl(fd, VIDIOC_QUERYCAP, &vcap)) {
- fprintf(stderr, "%s: not a v4l2 node\n", device);
- exit(1);
- }
+ doioctl(fd, VIDIOC_QUERYCAP, &vcap);
capabilities = vcap.capabilities;
if (capabilities & V4L2_CAP_DEVICE_CAPS)
capabilities = vcap.device_caps;