From patchwork Mon Aug 14 10:31:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 9898501 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8C5F0602D9 for ; Mon, 14 Aug 2017 10:31:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EED628564 for ; Mon, 14 Aug 2017 10:31:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73AF9285D4; Mon, 14 Aug 2017 10:31:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF1DD28564 for ; Mon, 14 Aug 2017 10:31:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752813AbdHNKbk (ORCPT ); Mon, 14 Aug 2017 06:31:40 -0400 Received: from nblzone-211-213.nblnetworks.fi ([83.145.211.213]:43922 "EHLO hillosipuli.retiisi.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752195AbdHNKbk (ORCPT ); Mon, 14 Aug 2017 06:31:40 -0400 Received: from lanttu.localdomain (unknown [IPv6:2001:1bc8:1a6:d3d5::e1:1002]) by hillosipuli.retiisi.org.uk (Postfix) with ESMTP id B3F096013A; Mon, 14 Aug 2017 13:31:38 +0300 (EEST) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: mchehab@s-opensource.com, hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com Subject: [PATCH 1/2] v4l: fwnode: Fix lane-polarities property parsing Date: Mon, 14 Aug 2017 13:31:36 +0300 Message-Id: <20170814103137.17882-2-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170814103137.17882-1-sakari.ailus@linux.intel.com> References: <20170814103137.17882-1-sakari.ailus@linux.intel.com> 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 fwnode_property_read_u32_array() only returns the number of array elements if the array argument is NULL. The assumption that it always did so lead to lane-polarities properties never being read. Fixes: 4ee236219f6d ("media: v4l2-fwnode: suppress a warning at OF parsing logic") Signed-off-by: Sakari Ailus --- drivers/media/v4l2-core/v4l2-fwnode.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c index d07c54efaa99..29e41312f04a 100644 --- a/drivers/media/v4l2-core/v4l2-fwnode.c +++ b/drivers/media/v4l2-core/v4l2-fwnode.c @@ -65,19 +65,23 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode, } rval = fwnode_property_read_u32_array(fwnode, - "lane-polarities", array, - 1 + bus->num_data_lanes); + "lane-polarities", NULL, + 0); if (rval > 0) { - if (rval != 1 + bus->num_data_lanes /* clock + data */) { + if (rval != 1 + bus->num_data_lanes /* clock+data */) { pr_warn("invalid number of lane-polarities entries (need %u, got %u)\n", 1 + bus->num_data_lanes, rval); return -EINVAL; } + fwnode_property_read_u32_array(fwnode, + "lane-polarities", array, + 1 + bus->num_data_lanes); for (i = 0; i < 1 + bus->num_data_lanes; i++) bus->lane_polarities[i] = array[i]; } + } if (!fwnode_property_read_u32(fwnode, "clock-lanes", &v)) {