Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp508607yba; Wed, 15 May 2019 05:21:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqxNbXfWSEluw+gQymCWsg8eFmgwzBDSzD3nTj8wIwY9EC6tLknL1PqM91Q0lGkS7DfwWBWa X-Received: by 2002:a63:3d0b:: with SMTP id k11mr43216838pga.349.1557922912056; Wed, 15 May 2019 05:21:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557922912; cv=none; d=google.com; s=arc-20160816; b=B9x5oAu0qTIGFILL98NnNbmdODyIkUOzuIYy4DYKERd7zEK0/tZ/AbIi5BgLRGApSb aU2MlQmiJ3pYXN/cZ+UKs3S6OfyTOPdHl12Ml+f1AoEiUajRtgAFnRjqnUBOCI3d+um7 Lvib8KgrcPg9fDK/m+5gQRd9Kzciw9JQ501Aj5sUQih/odELsfx2LY6HzEOpyKIGarqZ NpSd4rhsKAaxHusCPIAr0LnjicWD+v7RT7l6difkd7YCC0bIYiwnxy1Xtb5bgOSd02Sf zpkOWrCKecR88f6YogkqUuwd7kKq5F2kDmXfQhpYqKsfZ9rLiMbsPrVSsYCNlHajC0v1 ZXrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=aqQAXDYktfmJ6zPDMygI+mEcO6EFlQLF3+FYY7MgPqw=; b=pobovynAbnAbP5rLejTG9/rOlcAyUevv4Z2vknn1EXEk+avWMQc3WQOSo14+tBUIQh dSCKsCliPeN9FrEdUIdzATs3Ny4RhtihVAAwXfMr/Kk1m0QIObCHSWk6PmaG53OtyFtH Q3KoKZzRBUnexr1RoVWxJB2dt5jKA2Doi+GZsikq35dg9RbmGJnZfPdnBdgurfE52K6C Y7iunzHqxSpZWvxx8cuUdnKHdYHwHLowPV9XGefuHaAp6llAzxt40bgTOOJJlscQUi4d v3fCzIw6sDNFzQQ8dKQ5W6CahUyCgqOV4ga9RRgj9uD7qLO8eyo/DULiKM5bRh41OdRl +sAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YCjIKCzc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h40si1664094plb.243.2019.05.15.05.21.37; Wed, 15 May 2019 05:21:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YCjIKCzc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727188AbfEOK7f (ORCPT + 99 others); Wed, 15 May 2019 06:59:35 -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