From patchwork Tue May 19 17:11:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 29713 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Yul3l-0005e2-SF; Tue, 19 May 2015 19:12:05 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.76/mailfrontend-7) with esmtp id 1Yul3j-0005BO-1c; Tue, 19 May 2015 19:12:05 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751006AbbESRLq (ORCPT + 1 other); Tue, 19 May 2015 13:11:46 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:33060 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750865AbbESRLq (ORCPT ); Tue, 19 May 2015 13:11:46 -0400 Received: by wgjc11 with SMTP id c11so25554780wgj.0; Tue, 19 May 2015 10:11:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=DKcHXSRKWzQdGUa34omPxUf+yCtXhiCA/UIsMHUC8+Y=; b=gI45jEIUlMGCXauHQjpQAq2fY7jRtugfTWm+EOVxuFGJaAKXhUyQfJNmpIaFxBhFuS ojxran5ZVGIa7Ct3mhQEOAn32acAnaozap7eYi6Yh+7ZCpM5FTXHv0RmKMvTVIJHv30h kAbt+JH6Lc6oreqfNPKDgrV9sn41uNd15UCLmdnMdDoclZFxCYBjZ9/cZkVxNobh0vtK cbUIGEhLlexrGwoioisCC6V4lZFvbdls42baG8tiV1uhjfZHrHr1imOCvJmTpAEFiMcs 90FAIUiHvP9WNnRBKHYZee0wM9ZNV+GFNelwZSVD/IEcnJS9hYi5GQchEUEX/972Y3FH 77pA== X-Received: by 10.180.19.100 with SMTP id d4mr33843267wie.29.1432055504734; Tue, 19 May 2015 10:11:44 -0700 (PDT) Received: from tango-charlie.RL.local ([194.72.83.162]) by mx.google.com with ESMTPSA id gj7sm18246142wib.4.2015.05.19.10.11.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 May 2015 10:11:44 -0700 (PDT) From: Lad Prabhakar To: LMML Cc: lkml , "Lad, Prabhakar" Subject: [PATCH] media: v4l2-core/v4l2-of.c: determine bus_type only on hsync/vsync flags Date: Tue, 19 May 2015 18:11:23 +0100 Message-Id: <1432055483-23563-1-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 2.1.0 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: 2015.5.19.170315 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1600_1699 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 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, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: "Lad, Prabhakar" the bus_type needs to be determined only on the hsync/vsync flags, this patch fixes the above by moving the check just after hsync/vsync flags are being set. Reported-by: Nikhil Devshatwar Signed-off-by: Lad, Prabhakar --- drivers/media/v4l2-core/v4l2-of.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-of.c b/drivers/media/v4l2-core/v4l2-of.c index c52fb96..7f89c70 100644 --- a/drivers/media/v4l2-core/v4l2-of.c +++ b/drivers/media/v4l2-core/v4l2-of.c @@ -93,6 +93,11 @@ static void v4l2_of_parse_parallel_bus(const struct device_node *node, flags |= v ? V4L2_MBUS_VSYNC_ACTIVE_HIGH : V4L2_MBUS_VSYNC_ACTIVE_LOW; + if (flags) + endpoint->bus_type = V4L2_MBUS_PARALLEL; + else + endpoint->bus_type = V4L2_MBUS_BT656; + if (!of_property_read_u32(node, "pclk-sample", &v)) flags |= v ? V4L2_MBUS_PCLK_SAMPLE_RISING : V4L2_MBUS_PCLK_SAMPLE_FALLING; @@ -100,10 +105,6 @@ static void v4l2_of_parse_parallel_bus(const struct device_node *node, if (!of_property_read_u32(node, "field-even-active", &v)) flags |= v ? V4L2_MBUS_FIELD_EVEN_HIGH : V4L2_MBUS_FIELD_EVEN_LOW; - if (flags) - endpoint->bus_type = V4L2_MBUS_PARALLEL; - else - endpoint->bus_type = V4L2_MBUS_BT656; if (!of_property_read_u32(node, "data-active", &v)) flags |= v ? V4L2_MBUS_DATA_ACTIVE_HIGH :