diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 17:48:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 17:48:00 -0800 |
| commit | 1480d0a31db62b9803f829cc0e5cc71935ffe3cc (patch) | |
| tree | c7c18939b5a0d51f23f7ca8606ecf00fa69741aa /drivers/net/irda | |
| parent | fc8e3d177fa8073895d37b50282489dbeec89eb1 (diff) | |
| parent | 46595ffbfc8ba79f27cdf8a029ee068b3b34c69f (diff) | |
| download | linux-3.10-1480d0a31db62b9803f829cc0e5cc71935ffe3cc.tar.gz linux-3.10-1480d0a31db62b9803f829cc0e5cc71935ffe3cc.tar.bz2 linux-3.10-1480d0a31db62b9803f829cc0e5cc71935ffe3cc.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/net/irda')
| -rw-r--r-- | drivers/net/irda/pxaficp_ir.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index aef80f5e7c9..b886b07412a 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/net/irda/pxaficp_ir.c @@ -704,15 +704,12 @@ static int pxa_irda_stop(struct net_device *dev) return 0; } -static int pxa_irda_suspend(struct device *_dev, pm_message_t state, u32 level) +static int pxa_irda_suspend(struct device *_dev, pm_message_t state) { struct net_device *dev = dev_get_drvdata(_dev); struct pxa_irda *si; - if (!dev || level != SUSPEND_DISABLE) - return 0; - - if (netif_running(dev)) { + if (dev && netif_running(dev)) { si = netdev_priv(dev); netif_device_detach(dev); pxa_irda_shutdown(si); @@ -721,15 +718,12 @@ static int pxa_irda_suspend(struct device *_dev, pm_message_t state, u32 level) return 0; } -static int pxa_irda_resume(struct device *_dev, u32 level) +static int pxa_irda_resume(struct device *_dev) { struct net_device *dev = dev_get_drvdata(_dev); struct pxa_irda *si; - if (!dev || level != RESUME_ENABLE) - return 0; - - if (netif_running(dev)) { + if (dev && netif_running(dev)) { si = netdev_priv(dev); pxa_irda_startup(si); netif_device_attach(dev); |