From patchwork Tue Mar 26 15:12:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 2391721 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6869EDF25A for ; Thu, 4 Apr 2013 10:41:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759688Ab3DDKkf (ORCPT ); Thu, 4 Apr 2013 06:40:35 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:41015 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759682Ab3DDKkc (ORCPT ); Thu, 4 Apr 2013 06:40:32 -0400 Received: by mail-pd0-f170.google.com with SMTP id 10so1365884pdi.1 for ; Thu, 04 Apr 2013 03:40:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=Lo3OWNCXmS+LP9Q4I1sPQy48N4N6rDNeVIUPTpaoe2k=; b=u9N17m2JCF/JMBuc++kRlTXsqquB5PsKyXNm0O/orLlSR7l7hkL3QpegF9tWNVXvmf 2Uo6xQIE7AEX60sfpSlxKzX+2DUONRZS/jPuJtpVCzHtH01bSEy9AKEzrwO1IXyZJZKW pjwuYA8M9WdHxtKKbRrUyoz7q738NGzhcUNnmO7hnGuigSOq1T17brTbWIygYKxBI9j3 p/h7fLILN10yISVvNJNyJ7mRzprB/Od5cNMxV8+154o5DzxrcBemREObKRL7hPhEWHpk ezhjidvvW91HMTouBn0bCU61PcDyS/7eY/g6ka75IQusTZ6GQHAiQSvRAMm5Rdd4LI0g HJOQ== X-Received: by 10.66.19.201 with SMTP id h9mr8572738pae.188.1365072032177; Thu, 04 Apr 2013 03:40:32 -0700 (PDT) Received: from localhost.localdomain ([121.136.168.198]) by mx.google.com with ESMTPS id ef3sm10937823pad.20.2013.04.04.03.40.29 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 04 Apr 2013 03:40:31 -0700 (PDT) From: Kukjin Kim To: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Thomas Abraham , Linus Walleij , Kukjin Kim Subject: [PATCH 1/3] pinctrl: exynos5440: fix probe failure due to missing pin-list in config nodes Date: Wed, 27 Mar 2013 00:12:32 +0900 Message-Id: <1364310754-3692-2-git-send-email-kgene.kim@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1364310754-3692-1-git-send-email-kgene.kim@samsung.com> References: <1364310754-3692-1-git-send-email-kgene.kim@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org From: Thomas Abraham The property 'samsung,exynos5440-pins' is optional in configuration nodes which are included in the Exynos5440 pin-controller device node. Fix the incorrect failure in driver probe if 'samsung,exynos5440-pins' property is not found in the configuration nodes. Signed-off-by: Thomas Abraham Cc: Linus Walleij Signed-off-by: Kukjin Kim --- drivers/pinctrl/pinctrl-exynos5440.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/pinctrl-exynos5440.c b/drivers/pinctrl/pinctrl-exynos5440.c index 1376eb7..96cb1e9 100644 --- a/drivers/pinctrl/pinctrl-exynos5440.c +++ b/drivers/pinctrl/pinctrl-exynos5440.c @@ -670,8 +670,10 @@ static int exynos5440_pinctrl_parse_dt(struct platform_device *pdev, ret = exynos5440_pinctrl_parse_dt_pins(pdev, cfg_np, &pin_list, &npins); - if (ret) - return ret; + if (ret) { + gname = NULL; + goto skip_to_pin_function; + } /* derive pin group name from the node name */ gname = devm_kzalloc(dev, strlen(cfg_np->name) + GSUFFIX_LEN, @@ -687,6 +689,7 @@ static int exynos5440_pinctrl_parse_dt(struct platform_device *pdev, grp->num_pins = npins; grp++; +skip_to_pin_function: ret = of_property_read_u32(cfg_np, "samsung,exynos5440-pin-function", &function); if (ret) @@ -709,7 +712,7 @@ static int exynos5440_pinctrl_parse_dt(struct platform_device *pdev, return -ENOMEM; } func->groups[0] = gname; - func->num_groups = 1; + func->num_groups = gname ? 1 : 0; func->function = function; func++; func_idx++;