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=-10.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 8181FC4727D for ; Fri, 25 Sep 2020 12:53:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 46F6F22B2D for ; Fri, 25 Sep 2020 12:53:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601038406; bh=G99LDT++Lmv9gTgpTAVOUxdz7UenfKe58doTq1McXvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EgsQnNqRIYLQFByC9zJ2oIIa+jiYN0WEKVStkNE48NeoCQGIOmundDNQ1R2hVFkhu hfLBazuCz3dzUIRfKl+o63rGTuuSIfuneUo+X/XhlZcoAL+78CUtgRqSU2IGLONRGK cQgWyIHNcVPLlDyn5xLz8U+xpDhVGzdfXXWVJKfc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729417AbgIYMxY (ORCPT ); Fri, 25 Sep 2020 08:53:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:58634 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729404AbgIYMxS (ORCPT ); Fri, 25 Sep 2020 08:53:18 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 C378F2075E; Fri, 25 Sep 2020 12:53:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601038398; bh=G99LDT++Lmv9gTgpTAVOUxdz7UenfKe58doTq1McXvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uC1azpOMZb+HEA59Lad/cyqOgPLv7EtKuxU/tPwPXylIGTT6Qy/tcQOYAk+nAuuxt ISvqzVj314vh2EPUduJ9B4VOTja8vseSnXQALVvo8+rZ5e4uxpx4OmIvPcPbU8z27Q NtXB9nnqDu7BBtafj+YNsZwvCbObENrTtcqn9MNE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Fainelli , Andrew Lunn , "David S. Miller" Subject: [PATCH 5.4 39/43] net: phy: Do not warn in phy_stop() on PHY_DOWN Date: Fri, 25 Sep 2020 14:48:51 +0200 Message-Id: <20200925124729.471990495@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200925124723.575329814@linuxfoundation.org> References: <20200925124723.575329814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Florian Fainelli [ Upstream commit 5116a8ade333b6c2e180782139c9c516a437b21c ] When phy_is_started() was added to catch incorrect PHY states, phy_stop() would not be qualified against PHY_DOWN. It is possible to reach that state when the PHY driver has been unbound and the network device is then brought down. Fixes: 2b3e88ea6528 ("net: phy: improve phy state checking") Signed-off-by: Florian Fainelli Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/phy/phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -834,7 +834,7 @@ EXPORT_SYMBOL(phy_free_interrupt); */ void phy_stop(struct phy_device *phydev) { - if (!phy_is_started(phydev)) { + if (!phy_is_started(phydev) && phydev->state != PHY_DOWN) { WARN(1, "called from state %s\n", phy_state_to_str(phydev->state)); return;