Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ARM] 3066/1: Fix PXA irda driver suspend/resume functions

Browse Source 
Patch from Richard Purdie

Update the PXA irda driver to match the recent platform device
suspend/resume level changes.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Richard Purdie 2005-10-30 14:38:52 +00:00 committed by Russell King
parent 9f75e1eff3
commit 91e1a51229
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/irda/pxaficp_ir.c
View File

@ -704,15 +704,12 @@ static int pxa_irda_stop(struct net_device *dev)
return 0; 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 net_device *dev = dev_get_drvdata(_dev);
struct pxa_irda *si; struct pxa_irda *si;
if (!dev || level != SUSPEND_DISABLE) if (dev && netif_running(dev)) {
return 0;
if (netif_running(dev)) {
si = netdev_priv(dev); si = netdev_priv(dev);
netif_device_detach(dev); netif_device_detach(dev);
pxa_irda_shutdown(si); pxa_irda_shutdown(si);
@ -721,15 +718,12 @@ static int pxa_irda_suspend(struct device *_dev, pm_message_t state, u32 level)
return 0; 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 net_device *dev = dev_get_drvdata(_dev);
struct pxa_irda *si; struct pxa_irda *si;
if (!dev || level != RESUME_ENABLE) if (dev && netif_running(dev)) {
return 0;
if (netif_running(dev)) {
si = netdev_priv(dev); si = netdev_priv(dev);
pxa_irda_startup(si); pxa_irda_startup(si);
netif_device_attach(dev); netif_device_attach(dev);