From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98965ECE587 for ; Mon, 14 Oct 2019 15:53:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69F772133F for ; Mon, 14 Oct 2019 15:53:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="hCyh88la" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730565AbfJNPxr (ORCPT ); Mon, 14 Oct 2019 11:53:47 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:47017 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726169AbfJNPxr (ORCPT ); Mon, 14 Oct 2019 11:53:47 -0400 Received: by mail-wr1-f68.google.com with SMTP id o18so20287185wrv.13 for ; Mon, 14 Oct 2019 08:53:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0t1OM4slpGn/FciwgvtR1ItjOGOzF2p73EE7Lk2KZOE=; b=hCyh88laFReOQinVzQBy5MUAHRpJ2PKFi2cIw4C+dRkEimuPFJ8pmqwr1cqICMU94a cNLShzKyyXte63Zf3TmFKzQx1yGoIOzv4O5HPpJhNEhKvkhqdztOcpsDR8QBEuwkL3qq kKL3BHve8OMiMMhlJxq2E1Qsw1eGldVeRwIBLjrQ2KvOSsGR+FM5sQ1Cfzjq5AMoDqjP JrnyLnnkCVdrR1dBpBdPamSrN5lSj8blwq/tF0CsJEaBY2xsJp5klubXhb2d54mcHaPj gVo72sAMiQUODCnJhvr/L8H2SeM7e56YElxPH4vWc3Q4ec2mHgTmugBFDZlofQaIkqNP 2naw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0t1OM4slpGn/FciwgvtR1ItjOGOzF2p73EE7Lk2KZOE=; b=iY3uLDR/7YtlShai4OXh06rwYq42xHyevEM9T32aRZQmSoRIYG7zWYwTuyO24MU6RK quoxsXx3o7cdDuyzI1PoHtp5III4ZcO21wcTZBgPumw4gaYbR4zBBP8ZXnV3Qx4uQy45 xNk2yXB8vNNXLt5zOlkITQw8PZ2jca3Y0z6HiCRbP4OSlzFu1UPmIxFGJni1D/gcfo5N PtFP3IWbGiajKi9nd2OKKZAKEnLMDsf2WktsLUY/6Iug+U+1FNPWuLAptfz3A8RCpZhv lu2pv4/NPLHxfwjnmKCyBWd4oyXg3cpHHyUkbP/iP6sB4z/Jq6t77qkvC1wbjz/ta7XD iTnQ== X-Gm-Message-State: APjAAAWhQ8ZAweOx5ZhKv3z6+OTCAYe73/unAYU6Z1qU8Mx9t4BdckaJ GqZ1BbGBQQzF6upEe7z6G9DxXw== X-Google-Smtp-Source: APXvYqxBUAz0ltyZJGC9OKxGG3rjoJlKk1X9BzHdCHfcDtM+FNNfeISw9xtUdr+NCPM9Hbr8tlTEMQ== X-Received: by 2002:a5d:540d:: with SMTP id g13mr22534688wrv.8.1571068425381; Mon, 14 Oct 2019 08:53:45 -0700 (PDT) Received: from localhost.localdomain ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id 5sm17984836wrk.86.2019.10.14.08.53.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2019 08:53:44 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Greg Kroah-Hartman Cc: linux-gpio@vger.kernel.org, stable@vger.kernel.org, Marco Felsch , Bartosz Golaszewski Subject: [PATCH v5.3] gpio: fix getting nonexclusive gpiods from DT Date: Mon, 14 Oct 2019 17:53:41 +0200 Message-Id: <20191014155341.13145-1-brgl@bgdev.pl> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Marco Felsch Since commit ec757001c818 ("gpio: Enable nonexclusive gpiods from DT nodes") we are able to get GPIOD_FLAGS_BIT_NONEXCLUSIVE marked gpios. Currently the gpiolib uses the wrong flags variable for the check. We need to check the gpiod_flags instead of the of_gpio_flags else we return -EBUSY for GPIOD_FLAGS_BIT_NONEXCLUSIVE marked and requested gpiod's. Fixes: ec757001c818 gpio: Enable nonexclusive gpiods from DT nodes Cc: stable@vger.kernel.org Signed-off-by: Marco Felsch [Bartosz: the function was moved to gpiolib-of.c so updated the patch] Signed-off-by: Bartosz Golaszewski [Bartosz: backported to v5.3.y] Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpiolib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index d9074191edef..e4203c1eb869 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -4303,7 +4303,7 @@ struct gpio_desc *gpiod_get_from_of_node(struct device_node *node, transitory = flags & OF_GPIO_TRANSITORY; ret = gpiod_request(desc, label); - if (ret == -EBUSY && (flags & GPIOD_FLAGS_BIT_NONEXCLUSIVE)) + if (ret == -EBUSY && (dflags & GPIOD_FLAGS_BIT_NONEXCLUSIVE)) return desc; if (ret) return ERR_PTR(ret); -- 2.23.0