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=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 7EBCBC04E53 for ; Wed, 15 May 2019 10:59:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CD6920843 for ; Wed, 15 May 2019 10:59:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557917977; bh=jm02f6r3ja8E6ZgprEgR7RUosz5EhAKEbLMC+rj/3Ps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LxnvHyA5TOd96o+C6gmnRR9BZM7UflJUT/JmCN43uqIAio/ahok87RU/hdIuLGv1K U50skrkHs+SJtopEGdp8eKkt/5pTLODOTu0D0aeAXc2B12mjyZyafRBrR6K5WJbhX/ Rubwkrg5zqe2htaMwx2932Ft14ufSR7+00m7EBfw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727192AbfEOK7g (ORCPT ); Wed, 15 May 2019 06:59:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:56124 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727177AbfEOK7d (ORCPT ); Wed, 15 May 2019 06:59:33 -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 7B0CF21726; Wed, 15 May 2019 10:59:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557917973; bh=jm02f6r3ja8E6ZgprEgR7RUosz5EhAKEbLMC+rj/3Ps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YCjIKCzc+XooxsdY6h7f/z4VbzdNxSee+rBbMtVyoYxJ4NvNlCf/d86z4PltYzIc5 DGRWN+41GvXUNHYOtIImuo/KctS50T8aRA+LyszfKHbGlXP9zBOqQ0dnHSEM3yr6h8 J/Ry3dD++U4Y1ZFOFaYXstOB8q1ZcEnCTEJC2axY= 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 3.18 18/86] net: ks8851: Reassert reset pin if chip ID check fails Date: Wed, 15 May 2019 12:54:55 +0200 Message-Id: <20190515090646.270274808@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090642.339346723@linuxfoundation.org> References: <20190515090642.339346723@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 4a29e191819f..e218e45dcf35 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