From patchwork Fri Jan 9 08:40:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Holmberg X-Patchwork-Id: 426952 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 BD06C140161 for ; Fri, 9 Jan 2015 19:38:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754001AbbAIIiZ (ORCPT ); Fri, 9 Jan 2015 03:38:25 -0500 Received: from mga01.intel.com ([192.55.52.88]:56174 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753805AbbAIIiZ (ORCPT ); Fri, 9 Jan 2015 03:38:25 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP; 09 Jan 2015 00:38:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,729,1413270000"; d="scan'208";a="634768482" Received: from betelguse.isk.intel.com ([10.102.209.25]) by orsmga001.jf.intel.com with ESMTP; 09 Jan 2015 00:38:22 -0800 From: Hans Holmberg To: Linus Walleij , Alexandre Courbot Cc: linux-gpio@vger.kernel.org, Hans Holmberg Subject: [PATCH] gpiolib: of: Correct error handling in of_get_named_gpiod_flags Date: Fri, 9 Jan 2015 09:40:43 +0100 Message-Id: <1420792844-27781-1-git-send-email-hans.holmberg@intel.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org of_get_named_gpiod_flags fails with -EPROBE_DEFER in cases where the gpio chip is available and the GPIO translation fails. This causes drivers to be re-probed erroneusly, and hides the real problem(i.e. the GPIO number being out of range). Signed-off-by: Hans Holmberg Reviewed-by: Alexandre Courbot --- drivers/gpio/gpiolib-of.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 604dbe6..08261f2 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -45,8 +45,14 @@ static int of_gpiochip_find_and_xlate(struct gpio_chip *gc, void *data) return false; ret = gc->of_xlate(gc, &gg_data->gpiospec, gg_data->flags); - if (ret < 0) - return false; + if (ret < 0) { + /* We've found the gpio chip, but the translation failed. + * Return true to stop looking and return the translation + * error via out_gpio + */ + gg_data->out_gpio = ERR_PTR(ret); + return true; + } gg_data->out_gpio = gpiochip_get_desc(gc, ret); return true;