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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 76685C282CE for ; Mon, 22 Apr 2019 19:50:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4687D218FE for ; Mon, 22 Apr 2019 19:50:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962640; bh=/qcveRh5jOfqWowfOPgCA+EFZHx8linhRKhscyUN+GQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rqqyiQceHs9QsYz7ILOsoQnOPE420PjlOk+VyQWm206VJLnjWjHi8CWNhgGaF9Z+4 WNMbsJz/3ZiV68AxRQzC52U1i/PrXL2ZykB6fvplBO//DqdxLlrKw9BmB/8B3OYKzZ aKTsPbX+z1RrnxTxtITmg2kOWFMemQPRbxbjmidY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731145AbfDVTui (ORCPT ); Mon, 22 Apr 2019 15:50:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:54650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730420AbfDVTug (ORCPT ); Mon, 22 Apr 2019 15:50:36 -0400 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 29A9A20643; Mon, 22 Apr 2019 19:50:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962635; bh=/qcveRh5jOfqWowfOPgCA+EFZHx8linhRKhscyUN+GQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1nyvwBBronCD+iKYlfJTMh2sX0o55TtKkwrH6RxA/s8WJaQCNwi4v+s0nO96QUmE6 2OVIiKUl7yCe6a0OEqhTbtEN+5wC5gk3j2ZOBcE6YK4jlYbt+IiutDAPQkV2kpx2cD 1N0bdF05WanaAU//rIfgSDF8wHaNebd/Ztt2yQQI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lukas Wunner , Frank Pavlic , Stephen Boyd , Nishanth Menon , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 3.18 05/15] net: ks8851: Reassert reset pin if chip ID check fails Date: Mon, 22 Apr 2019 15:50:12 -0400 Message-Id: <20190422195022.13760-5-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190422195022.13760-1-sashal@kernel.org> References: <20190422195022.13760-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: Lukas Wunner [ 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