diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-23 10:00:05 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-23 10:00:05 -0800 |
commit | 193cb93e5a5f32c0520eed17e87135d20594d1e1 (patch) | |
tree | 3b5584f4e5e73f5f01807e5176cbe29e1db69868 /drivers/net/wimax/i2400m/usb.c | |
parent | 23e707dd9b0b26215d801c59e87feed1c218a0f9 (diff) | |
parent | f42ecb2808db5386f983d593a7c08d3ea3b94a27 (diff) | |
download | kernel-crypto-193cb93e5a5f32c0520eed17e87135d20594d1e1.tar.gz kernel-crypto-193cb93e5a5f32c0520eed17e87135d20594d1e1.tar.xz kernel-crypto-193cb93e5a5f32c0520eed17e87135d20594d1e1.zip |
Merge branch 'master' of /home/gregkh/linux/git/torvalds-2.6
Diffstat (limited to 'drivers/net/wimax/i2400m/usb.c')
-rw-r--r-- | drivers/net/wimax/i2400m/usb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c index 47e84ef355c..3b48681f8a0 100644 --- a/drivers/net/wimax/i2400m/usb.c +++ b/drivers/net/wimax/i2400m/usb.c @@ -579,7 +579,7 @@ void i2400mu_disconnect(struct usb_interface *iface) * * As well, the device might refuse going to sleep for whichever * reason. In this case we just fail. For system suspend/hibernate, - * we *can't* fail. We look at usb_dev->auto_pm to see if the + * we *can't* fail. We check PM_EVENT_AUTO to see if the * suspend call comes from the USB stack or from the system and act * in consequence. * @@ -591,14 +591,11 @@ int i2400mu_suspend(struct usb_interface *iface, pm_message_t pm_msg) int result = 0; struct device *dev = &iface->dev; struct i2400mu *i2400mu = usb_get_intfdata(iface); -#ifdef CONFIG_PM - struct usb_device *usb_dev = i2400mu->usb_dev; -#endif unsigned is_autosuspend = 0; struct i2400m *i2400m = &i2400mu->i2400m; #ifdef CONFIG_PM - if (usb_dev->auto_pm > 0) + if (pm_msg.event & PM_EVENT_AUTO) is_autosuspend = 1; #endif |