Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / wimax / i2400m / usb.c

diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index d3365ac85dde4639e455b35b65c805cdec1aa552..298f2b0b6311334094aaf3fb78bca9351ee23d44 100644 (file)
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -514,7 +514,7 @@ int i2400mu_probe(struct usb_interface *iface,
 #ifdef CONFIG_PM
        iface->needs_remote_wakeup = 1;         /* autosuspend (15s delay) */
        device_init_wakeup(dev, 1);
-       usb_dev->autosuspend_delay = 15 * HZ;
+       pm_runtime_set_autosuspend_delay(&usb_dev->dev, 15000);
        usb_enable_autosuspend(usb_dev);
 #endif
 
@@ -780,7 +780,6 @@ module_init(i2400mu_driver_init);
 static
 void __exit i2400mu_driver_exit(void)
 {
-       flush_scheduled_work(); /* for the stuff we schedule from sysfs.c */
        usb_deregister(&i2400mu_driver);
 }
 module_exit(i2400mu_driver_exit);