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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 AAF26C33CAF for ; Thu, 16 Jan 2020 17:44:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 76DD224773 for ; Thu, 16 Jan 2020 17:44:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196690; bh=XVeXgXUCIJpS32xus8OojbKyYYJFW7SwX6zT8JBfEtY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FMQw9IjyejsuPKVqVSFnLCzq2Y4a0+Wz5hla7Y6SfDeNDdAkh9O8VGh/iy9mHqUSV WPEIbyeS4O1G3IlF4dvy9gbXO14MZ9lilV7n3VIc+IeKqv+3pv/l0T3kDAC5FR312A 48GuGrJfg8M0JS/t7vOAxIFao1rTMafoXqOsCOdE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405973AbgAPRot (ORCPT ); Thu, 16 Jan 2020 12:44:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:35486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394172AbgAPRo3 (ORCPT ); Thu, 16 Jan 2020 12:44:29 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 63D3C2475E; Thu, 16 Jan 2020 17:44:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196669; bh=XVeXgXUCIJpS32xus8OojbKyYYJFW7SwX6zT8JBfEtY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yM8jhYhbddPS7UBKJQZuMs2+DCqss4lNoCXzZ7direrf3OPW2M8vIFJe6yMvDE12w M/AsYQG/R8TzhgITTzSNytx5xdo5Ga1H9Y9koA63ohcQaVLxkIznAoSk1N7gfL6Jxx mP3tjftbdiHdtyw6wwWfLditlvIjby067A+nGWpA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Li Yang , Sasha Levin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 4.4 070/174] soc/fsl/qe: Fix an error code in qe_pin_request() Date: Thu, 16 Jan 2020 12:41:07 -0500 Message-Id: <20200116174251.24326-70-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116174251.24326-1-sashal@kernel.org> References: <20200116174251.24326-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 --- arch/powerpc/sysdev/qe_lib/gpio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/sysdev/qe_lib/gpio.c b/arch/powerpc/sysdev/qe_lib/gpio.c index 521e67a49dc4..4052e3d7edbd 100644 --- a/arch/powerpc/sysdev/qe_lib/gpio.c +++ b/arch/powerpc/sysdev/qe_lib/gpio.c @@ -155,8 +155,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