From 1b5d70da4b4ec980652bb62e562a6543bb877213 Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Wed, 30 Dec 2009 08:23:32 +0000 Subject: [PATCH] --- yaml --- r: 179072 b: refs/heads/master c: 29fb00e047eae927a3f1a0367c0cfed7ad5228ef h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ucc_geth.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a9e04df55f75..c0ea8ac52505 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f5cb43406d0b29b96248f5328a14a6f6abf8ae6 +refs/heads/master: 29fb00e047eae927a3f1a0367c0cfed7ad5228ef diff --git a/trunk/drivers/net/ucc_geth.c b/trunk/drivers/net/ucc_geth.c index 41ad2f3697c7..96bdc0b43889 100644 --- a/trunk/drivers/net/ucc_geth.c +++ b/trunk/drivers/net/ucc_geth.c @@ -3607,6 +3607,7 @@ static int ucc_geth_suspend(struct of_device *ofdev, pm_message_t state) if (!netif_running(ndev)) return 0; + netif_device_detach(ndev); napi_disable(&ugeth->napi); /* @@ -3665,7 +3666,7 @@ static int ucc_geth_resume(struct of_device *ofdev) phy_start(ugeth->phydev); napi_enable(&ugeth->napi); - netif_start_queue(ndev); + netif_device_attach(ndev); return 0; }