From patchwork Wed Aug 24 10:17:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hans Verkuil (hansverk)" X-Patchwork-Id: 36639 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bcVFw-0005TQ-4k; Wed, 24 Aug 2016 10:18:00 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-7) with esmtp id 1bcVFt-0005uv-35; Wed, 24 Aug 2016 12:17:59 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753944AbcHXKRz (ORCPT + 1 other); Wed, 24 Aug 2016 06:17:55 -0400 Received: from aer-iport-1.cisco.com ([173.38.203.51]:15772 "EHLO aer-iport-1.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753384AbcHXKRy (ORCPT ); Wed, 24 Aug 2016 06:17:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=675; q=dns/txt; s=iport; t=1472033874; x=1473243474; h=to:from:subject:message-id:date:mime-version: content-transfer-encoding; bh=taws/ld1RNEzStdNZ+i0PTNXAPixXwMzbmJ6mr35JLo=; b=FJ0zmaELSYJP3Ey62ahFnbJLbW/u6QFEPnynED7gMoy5OopxPvAaBv9+ +Ah676jx0iXBuyqC39tul07OEj3ZVJYc8KfZhv40XYSQrf0Rp7A98Mr8G ebLOzO8LlYaKwcCkIHYpqf8rBGlG+F1Jwsmsiq8SAYOvD3n14gfZeXzXn 8=; X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0CtBACOc71X/xbLJq1dgykBAQEBAYFwt?= =?us-ascii?q?X+CD4F+iCMSAgEBAQEBAQFeJ4ULBFE2AgUWCwILAwIBAgFLDQYCAogtn0mPZY9?= =?us-ascii?q?/AQEIAgEkgQKFK4wOgloBBJlIjyKJWYV3kDklCSaCEhyBTjo0hnoBAQE?= X-IronPort-AV: E=Sophos;i="5.28,570,1464652800"; d="scan'208";a="685791439" Received: from aer-iport-nat.cisco.com (HELO aer-core-2.cisco.com) ([173.38.203.22]) by aer-iport-1.cisco.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Aug 2016 10:17:23 +0000 Received: from [10.47.79.81] ([10.47.79.81]) (authenticated bits=0) by aer-core-2.cisco.com (8.14.5/8.14.5) with ESMTP id u7OAHMH9020013 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO) for ; Wed, 24 Aug 2016 10:17:23 GMT To: linux-media From: Hans Verkuil Subject: [PATCH for v4.8] cec: fix ioctl return code when not registered Message-ID: <57BD7432.9090502@cisco.com> Date: Wed, 24 Aug 2016 12:17:22 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.5.0 MIME-Version: 1.0 X-Authenticated-User: hansverk Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.8.24.100916 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_LESS 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, BODY_SIZE_800_899 0, DKIM_SIGNATURE 0, NO_URI_HTTPS 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MOZILLA_MSGID 0, __MOZILLA_USER_AGENT 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NAME 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0, __USER_AGENT 0' Don't return the confusing -EIO error code when the device is not registered, instead return -ENODEV which is the proper thing to do in this situation. Signed-off-by: Hans Verkuil --- -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/staging/media/cec/cec-api.c b/drivers/staging/media/cec/cec-api.c index 7be7615..049f171 100644 --- a/drivers/staging/media/cec/cec-api.c +++ b/drivers/staging/media/cec/cec-api.c @@ -435,7 +435,7 @@ static long cec_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) void __user *parg = (void __user *)arg; if (!devnode->registered) - return -EIO; + return -ENODEV; switch (cmd) { case CEC_ADAP_G_CAPS: