From patchwork Thu Jul 7 13:02:06 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: 35202 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bL8x9-0004TW-UM; Thu, 07 Jul 2016 13:02:51 +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-8) with esmtp id 1bL8x6-0008Mk-lr; Thu, 07 Jul 2016 15:02:50 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751650AbcGGNCq (ORCPT + 1 other); Thu, 7 Jul 2016 09:02:46 -0400 Received: from aer-iport-2.cisco.com ([173.38.203.52]:22609 "EHLO aer-iport-2.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751853AbcGGNCk (ORCPT ); Thu, 7 Jul 2016 09:02:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=1111; q=dns/txt; s=iport; t=1467896560; x=1469106160; h=from:subject:to:message-id:date:mime-version: content-transfer-encoding; bh=pv4ACOnLK2by/Rkj7lPJVOdC9baMcRcTYRJuqyjvDYs=; b=LDIoSBc55d5yz/ed+LS75vYezw/dR31gKinbrB9qKN8XB6Gfdh9KZOR/ srL308edczOtfUHPoAatzh9+T0ivY3bx4ZIJkYpP2YEMl/acIupDGCcc+ JZAS20UZ7MhVKCj+dDKcCb/EkK+zmvV/9unJqK+8P6oFRA2uka9RYUGmd M=; X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0DNAQAFUn5X/xbLJq1bhRC3C4IPgXuHe?= =?us-ascii?q?hQBAQEBAQEBZSeEdgRRNgIFFgsCCwMCAQIBSw0GAgKILJ4Nj2KPQAEBCAIBJIE?= =?us-ascii?q?BhSaMDoJaAQSZE45HiUuFXQKQCh42ggkcgU46Moh8AQEB?= X-IronPort-AV: E=Sophos;i="5.28,324,1464652800"; d="scan'208";a="635578751" Received: from aer-iport-nat.cisco.com (HELO aer-core-1.cisco.com) ([173.38.203.22]) by aer-iport-2.cisco.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jul 2016 13:02:07 +0000 Received: from [10.47.79.81] ([10.47.79.81]) (authenticated bits=0) by aer-core-1.cisco.com (8.14.5/8.14.5) with ESMTP id u67D26I1026004 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO) for ; Thu, 7 Jul 2016 13:02:06 GMT From: Hans Verkuil Subject: [PATCH] cec-funcs.h: add missing 'reply' for short audio descriptor To: linux-media Message-ID: <577E52CE.2060702@cisco.com> Date: Thu, 7 Jul 2016 15:02:06 +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.7.7.125117 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_1200_1299 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 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, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0, __USER_AGENT 0' The cec_msg_request_short_audio_descriptor function was missing the reply argument. That's needed if you want the framework to wait for the reply message. 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/include/linux/cec-funcs.h b/include/linux/cec-funcs.h index 19486009..763d0fe 100644 --- a/include/linux/cec-funcs.h +++ b/include/linux/cec-funcs.h @@ -1495,6 +1495,7 @@ static inline void cec_ops_report_short_audio_descriptor(const struct cec_msg *m static inline void cec_msg_request_short_audio_descriptor(struct cec_msg *msg, __u8 num_descriptors, + bool reply, const __u8 *audio_format_id, const __u8 *audio_format_code) { @@ -1504,6 +1505,7 @@ static inline void cec_msg_request_short_audio_descriptor(struct cec_msg *msg, num_descriptors = 4; msg->len = 2 + num_descriptors; msg->msg[1] = CEC_MSG_REQUEST_SHORT_AUDIO_DESCRIPTOR; + msg->reply = reply ? CEC_MSG_REPORT_SHORT_AUDIO_DESCRIPTOR : 0; for (i = 0; i < num_descriptors; i++) msg->msg[2 + i] = (audio_format_id[i] << 6) | (audio_format_code[i] & 0x3f);