Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[linux-2.6-block.git] / drivers / net / wireless / zd1201.c

diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index a66b93b7ff9a11fb98dbe19ee56a38846adc9007..48273dd05b636087165a19d0af75c1054c9c6654 100644 (file)
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -1905,6 +1905,7 @@ static struct usb_driver zd1201_usb = {
        .id_table = zd1201_table,
        .suspend = zd1201_suspend,
        .resume = zd1201_resume,
+       .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(zd1201_usb);