diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-09 14:40:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-09 14:40:09 -0700 |
| commit | 8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc (patch) | |
| tree | e5e6cc8637a44354997624f26d4d55834c9915b4 /drivers/net/wireless/libertas/if_usb.c | |
| parent | cd7e1f0b056c071860db65c847a854b3093d6606 (diff) | |
| parent | eab2ec83dbf0e32e28f3108f302ffdaa225d4cce (diff) | |
| download | linux-8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc.tar.gz linux-8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc.tar.bz2 linux-8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/libertas/if_usb.c')
| -rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index 92bc8c5f1ca2..a8262dea9b1f 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c @@ -300,6 +300,9 @@ static int if_usb_probe(struct usb_interface *intf, cardp->priv->fw_ready = 1; priv->hw_host_to_card = if_usb_host_to_card; + priv->enter_deep_sleep = NULL; + priv->exit_deep_sleep = NULL; + priv->reset_deep_sleep_wakeup = NULL; #ifdef CONFIG_OLPC if (machine_is_olpc()) priv->reset_card = if_usb_reset_olpc_card; |