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=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 E5B1AC282E1 for ; Mon, 22 Apr 2019 19:55:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA36F20643 for ; Mon, 22 Apr 2019 19:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962945; bh=IDz3KsstZMTDrJTfR72WbWxkRwIFdVVkKOamKo9NKcg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HRpqVwL7KXwcIPh9f3z7Na4151ooBDSxP5bLlmrJQiQDCV2o4VpKP2fhiITHly5fL o2RYztGzWI0Kn0wFcgvty7/LvqkB4mzD4pu03Y59vsBtgMMK7eJeUaNDdgOWzwNtDk C5XlyQ7XUSf//ow0bAQyIhb/nulywL1yip9pQ4CY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730775AbfDVTtP (ORCPT ); Mon, 22 Apr 2019 15:49:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:52882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730760AbfDVTtO (ORCPT ); Mon, 22 Apr 2019 15:49:14 -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 ACB0A218FE; Mon, 22 Apr 2019 19:49:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962553; bh=IDz3KsstZMTDrJTfR72WbWxkRwIFdVVkKOamKo9NKcg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0b7WvBoxmjc+T1KvNuKe1CxMSZc3VbUgfFc9j/0oiKyjPFrEHU3h+KEzzI9CApZuQ M4tQSLK4Y8oUiIW8lqQc8D7qwqiKF5/Tmo5vgAkpfWiZv9HOSQ305Txn/8WBif6BTM 2OUwo+B7pYNl4S/GugwHjUjkKMtxIPqMM0iu358A= 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 4.9 13/29] net: ks8851: Reassert reset pin if chip ID check fails Date: Mon, 22 Apr 2019 15:48:32 -0400 Message-Id: <20190422194848.13049-13-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190422194848.13049-1-sashal@kernel.org> References: <20190422194848.13049-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 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