summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2009-12-02 16:12:01 -0800
committerDmitry Shmidt <dimitrysh@google.com>2009-12-02 16:12:01 -0800
commit27e221f940ec3f98ccb716ed0aeb52cd8f77cfd5 (patch)
tree9f4f11dc5c7424d468b323bb1860438e849f1cb5
parent93826f4d911a7efde794a19e9e72a0a8cc6360ae (diff)
downloadandroid_hardware_broadcom_wlan-27e221f940ec3f98ccb716ed0aeb52cd8f77cfd5.tar.gz
android_hardware_broadcom_wlan-27e221f940ec3f98ccb716ed0aeb52cd8f77cfd5.tar.bz2
android_hardware_broadcom_wlan-27e221f940ec3f98ccb716ed0aeb52cd8f77cfd5.zip
bcm4329: Prevent deadlock in SPINWAIT_SLEEP() (b/2249878)
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r--bcm4329/src/dhd/sys/dhd.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/bcm4329/src/dhd/sys/dhd.h b/bcm4329/src/dhd/sys/dhd.h
index bd05923..e05763b 100644
--- a/bcm4329/src/dhd/sys/dhd.h
+++ b/bcm4329/src/dhd/sys/dhd.h
@@ -166,7 +166,7 @@ WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(wdf_device_info_t, dhd_get_wdf_device_info)
#define _DHD_PM_RESUME_WAIT(a, b) do {\
int retry = 0; \
while (dhd_mmc_suspend && retry++ != b) { \
- wait_event_timeout(a, FALSE, HZ/100); \
+ wait_event_interruptible_timeout(a, FALSE, HZ/100); \
} \
} while (0)
#define DHD_PM_RESUME_WAIT(a) _DHD_PM_RESUME_WAIT(a, 30)
@@ -178,7 +178,7 @@ WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(wdf_device_info_t, dhd_get_wdf_device_info)
#define SPINWAIT_SLEEP(a, exp, us) do { \
uint countdown = (us) + 9; \
while ((exp) && (countdown >= 10)) { \
- wait_event_timeout(a, FALSE, HZ/100); \
+ wait_event_interruptible_timeout(a, FALSE, HZ/100); \
countdown -= 10; \
} \
} while (0)