summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2009-11-12 14:17:16 -0800
committerDmitry Shmidt <dimitrysh@google.com>2009-11-12 14:19:35 -0800
commit9080924374f5b58dd135eb21594ef1672d34be88 (patch)
treee0ba117374b524ad5ec055df25ec326f45ea8667
parentb4ace791eb574f589c53be582ea0d14e1a85ff09 (diff)
downloadplatform_hardware_broadcom_wlan-eclair-sholes-release.tar.gz
platform_hardware_broadcom_wlan-eclair-sholes-release.tar.bz2
platform_hardware_broadcom_wlan-eclair-sholes-release.zip
bcm4329: Increase timeout to handle delay caused by a2dp (b/2249878)android-2.0.1_r1eclair-sholes-release
Signed-off-by: Matthew Lai <matthew_lai@htc.com>
-rw-r--r--bcm4329/src/dhd/sys/dhd_dbg.h2
-rw-r--r--bcm4329/src/dhd/sys/dhd_linux.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/bcm4329/src/dhd/sys/dhd_dbg.h b/bcm4329/src/dhd/sys/dhd_dbg.h
index 581b17d..f7f0c35 100644
--- a/bcm4329/src/dhd/sys/dhd_dbg.h
+++ b/bcm4329/src/dhd/sys/dhd_dbg.h
@@ -57,7 +57,7 @@
#else /* DHD_DEBUG */
-#define DHD_ERROR(args)
+#define DHD_ERROR(args) printk args
#define DHD_TRACE(args)
#define DHD_INFO(args)
#define DHD_DATA(args)
diff --git a/bcm4329/src/dhd/sys/dhd_linux.c b/bcm4329/src/dhd/sys/dhd_linux.c
index 81e3cf6..2927532 100644
--- a/bcm4329/src/dhd/sys/dhd_linux.c
+++ b/bcm4329/src/dhd/sys/dhd_linux.c
@@ -2158,7 +2158,7 @@ dhd_module_init(void)
* It's needed to make sync up exit from dhd insmod and
* Kernel MMC sdio device callback registration
*/
- if (down_timeout(&dhd_registration_sem, msecs_to_jiffies(5000)) != 0) {
+ if (down_timeout(&dhd_registration_sem, msecs_to_jiffies(10000)) != 0) {
error = -EINVAL;
DHD_ERROR(("%s: sdio_register_driver failed \n", __FUNCTION__));
}