From patchwork Wed May 27 09:43:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongzhou Yang X-Patchwork-Id: 477019 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 27F6B1402B2 for ; Wed, 27 May 2015 19:44:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752716AbbE0Jo1 (ORCPT ); Wed, 27 May 2015 05:44:27 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:38990 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752506AbbE0JoY (ORCPT ); Wed, 27 May 2015 05:44:24 -0400 X-Listener-Flag: 11101 Received: from mtkhts07.mediatek.inc [(172.21.101.69)] by mailgw01.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 1735464844; Wed, 27 May 2015 17:44:22 +0800 Received: from mussux00.eus.mediatek.inc (172.29.97.100) by mtkhts07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 14.3.181.6; Wed, 27 May 2015 17:44:20 +0800 From: Hongzhou Yang To: Linus Walleij , Matthias Brugger CC: Hongzhou Yang , Yingjoe Chen , Chaotian Jing , Fabian Frederick , Axel Lin , Maoguang Meng , , , , , , Sascha Hauer , , Subject: [PATCH 2/2] pinctrl: mediatek: Fix pinctrl register irq fail bug. Date: Wed, 27 May 2015 02:43:55 -0700 Message-ID: <1432719835-18939-3-git-send-email-hongzhou.yang@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1432719835-18939-1-git-send-email-hongzhou.yang@mediatek.com> References: <1432719835-18939-1-git-send-email-hongzhou.yang@mediatek.com> MIME-Version: 1.0 X-MTK: N Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Since mt6397 is no need to support interrupt controller, I judged "interrupt-controller" property to skip it last patch. But the if judgement should on the contrary, this is a bug. And find of_property_read_bool is better for this case. So using of_property_read_bool instead of of_find_property. Also fix bug of misuse pointer. Signed-off-by: Hongzhou Yang Reviewed-by: Axel Lin --- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c index cd22729..f206a54 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c @@ -1280,7 +1280,7 @@ int mtk_pctrl_init(struct platform_device *pdev, goto pctrl_error; } - pctl->chip = &mtk_gpio_chip; + *pctl->chip = mtk_gpio_chip; pctl->chip->ngpio = pctl->devdata->npins; pctl->chip->label = dev_name(&pdev->dev); pctl->chip->dev = &pdev->dev; @@ -1300,7 +1300,7 @@ int mtk_pctrl_init(struct platform_device *pdev, goto chip_error; } - if (of_find_property(np, "interrupt-controller", NULL)) + if (!of_property_read_bool(np, "interrupt-controller")) return 0; /* Get EINT register base from dts. */