git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
tpm: read burstcount from TPM_STS in one 32-bit transaction
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
libertas
/
main.c
diff --git
a/drivers/net/wireless/libertas/main.c
b/drivers/net/wireless/libertas/main.c
index
4ae99a4
..
957681d
100644
(file)
--- a/
drivers/net/wireless/libertas/main.c
+++ b/
drivers/net/wireless/libertas/main.c
@@
-255,10
+255,8
@@
static int lbs_eth_stop(struct net_device *dev)
lbs_update_mcast(priv);
cancel_delayed_work_sync(&priv->scan_work);
- if (priv->scan_req) {
- cfg80211_scan_done(priv->scan_req, false);
- priv->scan_req = NULL;
- }
+ if (priv->scan_req)
+ lbs_scan_done(priv);
netif_carrier_off(priv->dev);