From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753349AbbIJNhj (ORCPT ); Thu, 10 Sep 2015 09:37:39 -0400 Received: from mail-ob0-f180.google.com ([209.85.214.180]:32956 "EHLO mail-ob0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751217AbbIJNhg (ORCPT ); Thu, 10 Sep 2015 09:37:36 -0400 From: Peng Fan To: linus.walleij@linaro.org, linux-kernel@vger.kernel.org Cc: linux-gpio@vger.kernel.org, van.freenix@gmail.com Subject: [PATCH] pinctrl: core: handle pinctrl_get failure Date: Thu, 10 Sep 2015 21:38:06 +0800 Message-Id: <1441892286-18989-1-git-send-email-van.freenix@gmail.com> X-Mailer: git-send-email 1.8.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Need to do error handling path when pinctrl_get fails. Also when pinctrl_get success, insert 'pctldev->node' to pinctrldev_list. Signed-off-by: Peng Fan Cc: Linus Walleij --- drivers/pinctrl/core.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 69723e0..ae6f9b6 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -1753,10 +1753,6 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc, goto out_err; } - mutex_lock(&pinctrldev_list_mutex); - list_add_tail(&pctldev->node, &pinctrldev_list); - mutex_unlock(&pinctrldev_list_mutex); - pctldev->p = pinctrl_get(pctldev->dev); if (!IS_ERR(pctldev->p)) { @@ -1776,8 +1772,14 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc, PINCTRL_STATE_SLEEP); if (IS_ERR(pctldev->hog_sleep)) dev_dbg(dev, "failed to lookup the sleep state\n"); + } else { + goto out_err; } + mutex_lock(&pinctrldev_list_mutex); + list_add_tail(&pctldev->node, &pinctrldev_list); + mutex_unlock(&pinctrldev_list_mutex); + pinctrl_init_device_debugfs(pctldev); return pctldev; -- 1.8.4