summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-02-12 04:41:25 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-02-12 04:41:25 -0800
commit16d0a2635fc9ea0eaff91f1679937cb80d4f28ef (patch)
tree337cbc4733547d250611e917d1d505ea035ea464
parentf42d0a2ff373e84851d1fa0f52a622e1f415c9bc (diff)
parente995de9bac680551bac84780b6ff6b4885932405 (diff)
Merge "Release 4.0.10.32 QCACLD WLAN Driver"
-rw-r--r--CORE/MAC/inc/qwlan_version.h4
-rw-r--r--CORE/SERVICES/HIF/USB/if_usb.c7
2 files changed, 9 insertions, 2 deletions
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h
index c59d04026b25..da728e083c7e 100644
--- a/CORE/MAC/inc/qwlan_version.h
+++ b/CORE/MAC/inc/qwlan_version.h
@@ -42,9 +42,9 @@ BRIEF DESCRIPTION:
#define QWLAN_VERSION_MINOR 0
#define QWLAN_VERSION_PATCH 10
#define QWLAN_VERSION_EXTRA ""
-#define QWLAN_VERSION_BUILD 31
+#define QWLAN_VERSION_BUILD 32
-#define QWLAN_VERSIONSTR "4.0.10.31"
+#define QWLAN_VERSIONSTR "4.0.10.32"
#define AR6320_REV1_VERSION 0x5000000
diff --git a/CORE/SERVICES/HIF/USB/if_usb.c b/CORE/SERVICES/HIF/USB/if_usb.c
index 9ea0915670ca..a34dcdc1a149 100644
--- a/CORE/SERVICES/HIF/USB/if_usb.c
+++ b/CORE/SERVICES/HIF/USB/if_usb.c
@@ -232,6 +232,9 @@ static void hif_usb_remove(struct usb_interface *interface)
*/
if (!sc)
return;
+
+ pr_info("Try to remove hif_usb!\n");
+
/* wait __hdd_wlan_exit until finished and no more than 4 seconds*/
while(atomic_read(&usb_sc->hdd_removed_processing) == 1 &&
usb_sc->hdd_removed_wait_cnt < 20) {
@@ -283,6 +286,7 @@ static void hif_usb_remove(struct usb_interface *interface)
pktlogmod_exit(scn);
#endif
__hdd_wlan_exit();
+ pr_info("Exit HDD wlan... done by %s\n", __func__);
}
hif_nointrs(sc);
@@ -504,6 +508,7 @@ void hif_unregister_driver(void)
{
if (is_usb_driver_register) {
long timeleft = 0;
+ pr_info("Try to unregister hif_driver\n");
if (usb_sc != NULL) {
/* wait __hdd_wlan_exit until finished and no more than
* 4 seconds
@@ -535,6 +540,7 @@ void hif_unregister_driver(void)
pktlogmod_exit(usb_sc->ol_sc);
#endif
__hdd_wlan_exit();
+ pr_info("Exit HDD wlan... done by %s\n", __func__);
}
atomic_set(&usb_sc->hdd_removed_processing, 0);
}
@@ -558,6 +564,7 @@ deregister:
timeleft);
finish:
usb_unregister_notify(&hif_usb_dev_nb);
+ pr_info("hif_unregister_driver!!!!!!\n");
}
}