From patchwork Thu Mar 23 20:21:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 742881 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 3vpydL2L2nz9s7K for ; Fri, 24 Mar 2017 07:21:58 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="siqnUmER"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752592AbdCWUVn (ORCPT ); Thu, 23 Mar 2017 16:21:43 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:34705 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752299AbdCWUVm (ORCPT ); Thu, 23 Mar 2017 16:21:42 -0400 Received: by mail-pf0-f196.google.com with SMTP id o126so33658735pfb.1; Thu, 23 Mar 2017 13:21:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=0wmHdAfo5GwX+ITBEdJrUNDTDXI1bVqv1+DSa2aOuZk=; b=siqnUmERDFAcxE67xYO9EvTeN8413x/eU0nJuSgIcKdg92AfH3Oh5ANqWkalIcr7RP 6lczMPXY1a0Ebv1geT1lOkjGnKBSrqm4+wtvjgl+BhKpXcPVA/VfHG28LLOvoQKLpics X6WvDG8hHFEqYzvTFqMG0ISb4n17pi4Y26roTyYI89F+4lc9pjnIGjxKUUBFU8HHUuN5 Can8wrDo3h8fvF8+QJuotfD06KbmwkW9s1oseWdNW55QcEv1GoqYHFT5XEgk6h9MN8bS zalyVCJ22dhDPg6+MQZ7llXvtQxL0lZEPGdvBe52bo17R+cxYtI9D/ms4b9qg5PDWr0f ay/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=0wmHdAfo5GwX+ITBEdJrUNDTDXI1bVqv1+DSa2aOuZk=; b=nIHqBd9lmT9uMS3n1Navk90Yllh+9Gm7osXI3uEc2Gu/AFj5RnIrvRuvaRN8jim/Gx 3FeevGXJeSKAHaAlYw0lvaQUL8eOSNfK4VZZzCe3F2RmbzrAVYHvFBtFHG7z4/R1kUu6 n+A2j23kQcAx8yNT1Ou3xddqNro221q7iwWSmXNKfAHv0mes4QCGB5ItH5UVuMi3QEsX tGq13CsBPYCMPHyIH/xBjohUpqZjfTLK4P7e6Q2qtnztZZ96rnTYRrYr9BqHbOIVKyNM IptzCE+l5Oe3lfqKbs8IZKZo5YLOsk+F75X9AWC6DpB1v0grhZvWEyo0fLy4XrT35rcd dGEA== X-Gm-Message-State: AFeK/H2Eo0u/T1HDn1xMPkSn4ntk9NbBx2WFXoXQ4xGqbCB6Tut+9rLqykGpTVHcdwGK6A== X-Received: by 10.98.10.202 with SMTP id 71mr5110827pfk.54.1490300500982; Thu, 23 Mar 2017 13:21:40 -0700 (PDT) Received: from dtor-ws ([2620:0:1000:1311:d115:b690:9df1:584d]) by smtp.gmail.com with ESMTPSA id p189sm70238pfb.128.2017.03.23.13.21.40 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 23 Mar 2017 13:21:40 -0700 (PDT) Date: Thu, 23 Mar 2017 13:21:38 -0700 From: Dmitry Torokhov To: Linus Walleij Cc: Alexandre Courbot , Mika Westerberg , Andy Shevchenko , "Rafael J. Wysocki" , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ACPI / gpio: do not fall back to parsing _CRS when we get a deferral Message-ID: <20170323202138.GA11912@dtor-ws> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org If, while locating GPIOs by name, we get probe deferral, we should immediately report it to caller rather than trying to fall back to parsing unnamed GPIOs from _CRS block. Signed-off-by: Dmitry Torokhov Acked-by: Mika Westerberg --- drivers/gpio/gpiolib-acpi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index a3faefa44f68..d3f9f028a37b 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -572,8 +572,10 @@ struct gpio_desc *acpi_find_gpio(struct device *dev, } desc = acpi_get_gpiod_by_index(adev, propname, idx, &info); - if (!IS_ERR(desc) || (PTR_ERR(desc) == -EPROBE_DEFER)) + if (!IS_ERR(desc)) break; + if (PTR_ERR(desc) == -EPROBE_DEFER) + return ERR_CAST(desc); } /* Then from plain _CRS GPIOs */