From patchwork Tue Aug 11 04:49:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongzhou Yang X-Patchwork-Id: 505865 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 6721714016A for ; Tue, 11 Aug 2015 14:50:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751053AbbHKEtq (ORCPT ); Tue, 11 Aug 2015 00:49:46 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:41369 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1750872AbbHKEtp (ORCPT ); Tue, 11 Aug 2015 00:49:45 -0400 X-Listener-Flag: 11101 Received: from mtkhts09.mediatek.inc [(172.21.101.70)] by mailgw01.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 1849993395; Tue, 11 Aug 2015 12:49:39 +0800 Received: from mussux00.eus.mediatek.inc (172.29.97.100) by mtkhts09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 14.3.181.6; Tue, 11 Aug 2015 12:49:38 +0800 From: Hongzhou Yang To: Linus Walleij , Matthias Brugger CC: Hongzhou Yang , Yingjoe Chen , Axel Lin , Antoine Tenart , Maoguang Meng , Masahiro Yamada , , , , , Sascha Hauer , , , Subject: [PATCH] pinctrl: mediatek: Fix multiple registeration issue. Date: Mon, 10 Aug 2015 21:49:31 -0700 Message-ID: <1439268571-10895-1-git-send-email-hongzhou.yang@mediatek.com> X-Mailer: git-send-email 1.7.9.5 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 Use dynamic allocation to fix multiple registeration issue. --------------8<-------------------- Since our common driver need support main chip and PMU at the same time, that means it will register two pinctrl device, and the pinctrl_desc structure should be used two times. But pinctrl_desc use global static definition, then the latest registered pinctrl device will overwrite the old one's, all members in pinctrl_desc will set to the new one's, such as name, pins and pins numbers, etc. This is a bug. Changing to use devm_kzalloc to fix it. Cc: stable@vger.kernel.org # v4.1+ Signed-off-by: Hongzhou Yang --- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 27 +++++++++++++++---------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c index ad1ea16..2bba504 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c @@ -1202,17 +1202,12 @@ static int mtk_pctrl_build_state(struct platform_device *pdev) return 0; } -static struct pinctrl_desc mtk_pctrl_desc = { - .confops = &mtk_pconf_ops, - .pctlops = &mtk_pctrl_ops, - .pmxops = &mtk_pmx_ops, -}; - int mtk_pctrl_init(struct platform_device *pdev, const struct mtk_pinctrl_devdata *data, struct regmap *regmap) { struct pinctrl_pin_desc *pins; + struct pinctrl_desc *mtk_pctrl_desc; struct mtk_pinctrl *pctl; struct device_node *np = pdev->dev.of_node, *node; struct property *prop; @@ -1265,12 +1260,22 @@ int mtk_pctrl_init(struct platform_device *pdev, for (i = 0; i < pctl->devdata->npins; i++) pins[i] = pctl->devdata->pins[i].pin; - mtk_pctrl_desc.name = dev_name(&pdev->dev); - mtk_pctrl_desc.owner = THIS_MODULE; - mtk_pctrl_desc.pins = pins; - mtk_pctrl_desc.npins = pctl->devdata->npins; + + mtk_pctrl_desc = devm_kzalloc(&pdev->dev, sizeof(*mtk_pctrl_desc), + GFP_KERNEL); + if (!mtk_pctrl_desc) + return -ENOMEM; + + mtk_pctrl_desc->name = dev_name(&pdev->dev); + mtk_pctrl_desc->owner = THIS_MODULE; + mtk_pctrl_desc->pins = pins; + mtk_pctrl_desc->npins = pctl->devdata->npins; + mtk_pctrl_desc->confops = &mtk_pconf_ops; + mtk_pctrl_desc->pctlops = &mtk_pctrl_ops; + mtk_pctrl_desc->pmxops = &mtk_pmx_ops; pctl->dev = &pdev->dev; - pctl->pctl_dev = pinctrl_register(&mtk_pctrl_desc, &pdev->dev, pctl); + + pctl->pctl_dev = pinctrl_register(mtk_pctrl_desc, &pdev->dev, pctl); if (IS_ERR(pctl->pctl_dev)) { dev_err(&pdev->dev, "couldn't register pinctrl driver\n"); return PTR_ERR(pctl->pctl_dev);