| Date | Wed, 09 Nov 2011 13:27:46 -0800 | From | Greg KH <> | Subject | [144/262] tg3: negate USE_PHYLIB flag check |
| |
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Pirko <jpirko@redhat.com>
[ Upstream commit e730c82347b9dc75914da998c44c3f348965db41 ]
USE_PHYLIB flag in tg3_remove_one() is being checked incorrectly. This results tg3_phy_fini->phy_disconnect is never called and when tg3 module is removed.
In my case this resulted in panics in phy_state_machine calling function phydev->adjust_link.
So correct this check.
Signed-off-by: Jiri Pirko <jpirko@redhat.com> Acked-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/net/tg3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -15278,7 +15278,7 @@ static void __devexit tg3_remove_one(str cancel_work_sync(&tp->reset_task); - if (!tg3_flag(tp, USE_PHYLIB)) { + if (tg3_flag(tp, USE_PHYLIB)) { tg3_phy_fini(tp); tg3_mdio_fini(tp); }
|