From 4d5a788e7aa41d832bb945c238788b149704f6cf Mon Sep 17 00:00:00 2001 From: David Fries Date: Mon, 8 Sep 2008 22:01:14 -0500 Subject: [PATCH] --- yaml --- r: 111813 b: refs/heads/master c: 539b06fc73b1d470b9ecb3fe7af6d5f439322c08 h: refs/heads/master i: 111811: d9e0fd9d3122418283f6bf071c3af12b5d2d9c25 v: v3 --- [refs] | 2 +- trunk/drivers/net/ne.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 506f5ec57745..91086f25021e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 533763d34862101090f8563aa9da202583b2423d +refs/heads/master: 539b06fc73b1d470b9ecb3fe7af6d5f439322c08 diff --git a/trunk/drivers/net/ne.c b/trunk/drivers/net/ne.c index fa3ceca4e15c..79599900c4b5 100644 --- a/trunk/drivers/net/ne.c +++ b/trunk/drivers/net/ne.c @@ -844,8 +844,12 @@ static int ne_drv_suspend(struct platform_device *pdev, pm_message_t state) { struct net_device *dev = platform_get_drvdata(pdev); - if (netif_running(dev)) + if (netif_running(dev)) { + struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv; netif_device_detach(dev); + if (idev) + pnp_stop_dev(idev); + } return 0; } @@ -854,6 +858,9 @@ static int ne_drv_resume(struct platform_device *pdev) struct net_device *dev = platform_get_drvdata(pdev); if (netif_running(dev)) { + struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv; + if (idev) + pnp_start_dev(idev); ne_reset_8390(dev); NS8390p_init(dev, 1); netif_device_attach(dev);