diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-03-03 00:51:24 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-03-03 00:51:24 +0100 |
| commit | d6fa4ec20db6bd0b403d2d99fd9423e6c0f3f845 (patch) | |
| tree | e9ddb16309d2b546a400593afc07846ce9ed6746 /drivers/net | |
| parent | dc1cfc34b2a07c5441d68ca21ae4296822ee4df6 (diff) | |
| parent | 1ff6b9489fbc737e3e2bc7660b92cebbfaea5247 (diff) | |
Conflicts:
arch/arm/mach-tegra/common.c
drivers/ata/ahci-tegra.c
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/bcm4329/wl_iw.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_linux.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcm4329/wl_iw.c b/drivers/net/wireless/bcm4329/wl_iw.c index e71ab64c2caa..8cb0f3af84ee 100644 --- a/drivers/net/wireless/bcm4329/wl_iw.c +++ b/drivers/net/wireless/bcm4329/wl_iw.c @@ -4339,6 +4339,7 @@ wl_iw_get_essid( if (!extra) return -EINVAL; + memset(&ssid, 0, sizeof(ssid)); if ((error = dev_wlc_ioctl(dev, WLC_GET_SSID, &ssid, sizeof(ssid)))) { WL_ERROR(("Error getting the SSID\n")); return error; diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c index 44879e4a1170..a6b6dc8be91f 100644 --- a/drivers/net/wireless/bcmdhd/dhd_linux.c +++ b/drivers/net/wireless/bcmdhd/dhd_linux.c @@ -3676,6 +3676,7 @@ void dhd_detach(dhd_pub_t *dhdp) #endif /* defined(CONFIG_HAS_EARLYSUSPEND) */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) + dhd->pub.hang_was_sent = 1; cancel_work_sync(&dhd->work_hang); #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */ |