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=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,T_DKIMWL_WL_HIGH,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 B38ECC04AA9 for ; Thu, 2 May 2019 15:24:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8575F20675 for ; Thu, 2 May 2019 15:24:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556810641; bh=LWbf59hWOGa48MXU4u1gRBfv7NgBBEpEqdzsjS+HTGo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PBiuRDUhVkm9x9IWRHyfV/aJz7t1tYLRxX4QfykKzdTm1WEKqSI8dtLOCLqEvGjNn FpCWVoYbf+lZcV9ai25HhpRMd36epZjyarjUYM68zRWkSPud2AqMvD2tihidFyEsrq VRLxQ+4F7ApUL87aD8UcNcy4XGU6ORrhNzlQh+gE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726371AbfEBPYA (ORCPT ); Thu, 2 May 2019 11:24:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:39728 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726521AbfEBPX7 (ORCPT ); Thu, 2 May 2019 11:23:59 -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 45B3620675; Thu, 2 May 2019 15:23:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556810638; bh=LWbf59hWOGa48MXU4u1gRBfv7NgBBEpEqdzsjS+HTGo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XCFgEg9gIBgd1Ha8Z4hBjNF3xFQESeEB1WmQb5nxhGBhoPizFgqEdUEo/n3OOqB/y 9lAzwE9/PWzigj7H8lIGXi11iH1v4zcxpuvPdU4onv9T/3IuzFeVfGcV7a1eAyBS8r FVu5+CJKZq5l+nvFjqHBpkd9Y3XiGM14N+xyiTLQ= 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.14 22/49] net: ks8851: Reassert reset pin if chip ID check fails Date: Thu, 2 May 2019 17:20:59 +0200 Message-Id: <20190502143326.769493558@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190502143323.397051088@linuxfoundation.org> References: <20190502143323.397051088@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 556666b0d756..546a79b9cb15 100644 --- a/drivers/net/ethernet/micrel/ks8851.c +++ b/drivers/net/ethernet/micrel/ks8851.c @@ -1545,9 +1545,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