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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 52635C04E53 for ; Wed, 15 May 2019 11:34:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 139A42084A for ; Wed, 15 May 2019 11:34:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557920064; bh=G1gKMeTX9JbVl501Usv3mK5qUwAQA8ljIadRchKIreU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sAFdLw2aFFRIaWrffDpvFw7adlD05B70rccY89S5eUs/uyamYjGlOPq3IjHTMu6yc /rMbRH2TcSkIZGWq3du3RUpvDJDz+u1FXKr+c6kymVZ81vxIUIug7+6PTNpO9/yVej gtmj43DFrPfT+wlF4YD1Qh9tRDLUqO0fu2O5yJY4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733002AbfEOLeS (ORCPT ); Wed, 15 May 2019 07:34:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:46372 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732485AbfEOLeR (ORCPT ); Wed, 15 May 2019 07:34:17 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 D9E0B2053B; Wed, 15 May 2019 11:34:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557920057; bh=G1gKMeTX9JbVl501Usv3mK5qUwAQA8ljIadRchKIreU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XgPmMlLMnipSyJinvFqw1y5eEQ7Qrajoyn9LfqpHBmbt5K/90XkOkYYbKSBXqwXuc 4exwrqcC5WJeouLFG0bzi+6DdOlO7yWLD6yIlnzldl7N7SbojNmAGEFBXbZOIjKQEw BIQrwAOQ4LCWSAb8bGUR/V+vPau1c/Qa5Uw5SCC0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lukas Wunner , Frank Pavlic , Stephen Boyd , Nishanth Menon , "David S. Miller" , "Sasha Levin (Microsoft)" Subject: [PATCH 4.4 097/266] net: ks8851: Reassert reset pin if chip ID check fails Date: Wed, 15 May 2019 12:53:24 +0200 Message-Id: <20190515090725.730795185@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090722.696531131@linuxfoundation.org> References: <20190515090722.696531131@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 [ Upstream commit 761cfa979a0c177d6c2d93ef5585cd79ae49a7d5 ] Commit 73fdeb82e963 ("net: ks8851: Add optional vdd_io regulator and reset gpio") amended the ks8851 driver to briefly assert the chip's reset pin on probe. It also amended the probe routine's error path to reassert the reset pin if a subsequent initialization step fails. However the commit misplaced reassertion of the reset pin in the error path such that it is not performed if the check of the Chip ID and Enable Register (CIDER) fails. The error path is therefore slightly asymmetrical to the probe routine's body. Fix it. Signed-off-by: Lukas Wunner Cc: Frank Pavlic Cc: Stephen Boyd Cc: Nishanth Menon Signed-off-by: David S. Miller Signed-off-by: Sasha Levin (Microsoft) --- drivers/net/ethernet/micrel/ks8851.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c index 247a3377b951..a8c5641ff955 100644 --- a/drivers/net/ethernet/micrel/ks8851.c +++ b/drivers/net/ethernet/micrel/ks8851.c @@ -1567,9 +1567,9 @@ static int ks8851_probe(struct spi_device *spi) free_irq(ndev->irq, ks); err_irq: +err_id: if (gpio_is_valid(gpio)) gpio_set_value(gpio, 0); -err_id: regulator_disable(ks->vdd_reg); err_reg: regulator_disable(ks->vdd_io); -- 2.19.1