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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 718EDC35243 for ; Fri, 24 Jan 2020 09:55:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 49387214AF for ; Fri, 24 Jan 2020 09:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859744; bh=kiMMRv82x4XqmMu1lZFxcnlazXJhy6Sf+dv7qmAf9FM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SaRZGOj9oK/zvMEYccMyDe6/3hvBXTX5f6WJ9vPXWdS3SXVBZJPjhdsfi7tJhIn6w mbqlEY5HYvf62vCWXQ9udGD6RnANsKP/pkx3PK2KXd/gYEiC3+UOXyamhog6XaB6cG TFk4AZbigVAUD2h4oiQ7RjvVa8AZ9ik8ntBR8dvY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388405AbgAXJzn (ORCPT ); Fri, 24 Jan 2020 04:55:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:59148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731598AbgAXJzm (ORCPT ); Fri, 24 Jan 2020 04:55:42 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 670CD20718; Fri, 24 Jan 2020 09:55:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859742; bh=kiMMRv82x4XqmMu1lZFxcnlazXJhy6Sf+dv7qmAf9FM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=axSP4GS5pGLiyatGZ/e51LLea4J9pOidlUpxTAa6HOUcPj+arpB/wUbC9/F4yxN+A KrxJOQi7Kpn11mQux3TxWz19sQFAwH+knIAdnUZkNKeclT7h3A5rQxfJgUlxeewg3p s3URjvCwKipgCGso2z2PiqAOjA6x04scuJGSfMuo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Li Yang , Sasha Levin Subject: [PATCH 4.14 161/343] soc/fsl/qe: Fix an error code in qe_pin_request() Date: Fri, 24 Jan 2020 10:29:39 +0100 Message-Id: <20200124092941.122647358@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dan Carpenter [ Upstream commit 5674a92ca4b7e5a6a19231edd10298d30324cd27 ] We forgot to set "err" on this error path. Fixes: 1a2d397a6eb5 ("gpio/powerpc: Eliminate duplication of of_get_named_gpio_flags()") Signed-off-by: Dan Carpenter Signed-off-by: Li Yang Signed-off-by: Sasha Levin --- drivers/soc/fsl/qe/gpio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/soc/fsl/qe/gpio.c b/drivers/soc/fsl/qe/gpio.c index 3b27075c21a7f..5cbc5ce5ac159 100644 --- a/drivers/soc/fsl/qe/gpio.c +++ b/drivers/soc/fsl/qe/gpio.c @@ -152,8 +152,10 @@ struct qe_pin *qe_pin_request(struct device_node *np, int index) if (err < 0) goto err0; gc = gpio_to_chip(err); - if (WARN_ON(!gc)) + if (WARN_ON(!gc)) { + err = -ENODEV; goto err0; + } if (!of_device_is_compatible(gc->of_node, "fsl,mpc8323-qe-pario-bank")) { pr_debug("%s: tried to get a non-qe pin\n", __func__); -- 2.20.1