diff options
| author | Randy Chiu <wchiu@qca.qualcomm.com> | 2014-04-24 13:52:38 +0800 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-04-26 00:48:12 -0700 |
| commit | d8b33bbfcb17230e51ce47640cd90f2ae9565cb9 (patch) | |
| tree | 8aa08f462276ca47dac01b4455b6c52ce88b8026 | |
| parent | 9be62a29ea8f7cf0c415069efad89402355750e7 (diff) | |
wlan: qcacld: remove too long and warning message occured
When doing remove module on USB3.0 port,we can find remove time is longer
than USB2.0.Warning message also occred after driver reload.
We move warm reset in the begin of disconnect callback and do
athdiag_procfs_remove once probe failed.
Change-Id: I5dcef64719e08e955cdeb721b77d88a4729d1955
CRs-fixed: 654369
| -rw-r--r-- | CORE/SERVICES/HIF/USB/hif_usb.c | 2 | ||||
| -rw-r--r-- | CORE/SERVICES/HIF/USB/if_usb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CORE/SERVICES/HIF/USB/hif_usb.c b/CORE/SERVICES/HIF/USB/hif_usb.c index c4cebf109866..c2084de506d5 100644 --- a/CORE/SERVICES/HIF/USB/hif_usb.c +++ b/CORE/SERVICES/HIF/USB/hif_usb.c @@ -170,8 +170,6 @@ void HIF_USBDeviceDetached(struct usb_interface *interface, break; } - HIFDiagWriteWARMRESET(interface, 0, 0); - device->surpriseRemoved = surprise_removed; /* inform upper layer if it is still interested */ if (surprise_removed diff --git a/CORE/SERVICES/HIF/USB/if_usb.c b/CORE/SERVICES/HIF/USB/if_usb.c index 27749f5c5021..fcbcf0bd5b8d 100644 --- a/CORE/SERVICES/HIF/USB/if_usb.c +++ b/CORE/SERVICES/HIF/USB/if_usb.c @@ -175,6 +175,7 @@ hif_usb_probe(struct usb_interface *interface, const struct usb_device_id *id) if (sc->hif_device != NULL) { ((HIF_DEVICE_USB *)(sc->hif_device))->sc = NULL; } + athdiag_procfs_remove(); goto err_config; } #ifndef REMOVE_PKT_LOG @@ -223,6 +224,7 @@ static void hif_usb_remove(struct usb_interface *interface) if (!sc) return; + HIFDiagWriteWARMRESET(interface, 0, 0); unregister_reboot_notifier(&sc->reboot_notifier); usb_put_dev(interface_to_usbdev(interface)); |