diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2009-12-02 18:14:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-02 18:14:21 -0800 |
| commit | aeedec3f4d02ac45d90f3520d184742982801949 (patch) | |
| tree | e6b069754c55be0f8a176f6c887d81814a81c362 | |
| parent | a79462f55f8c90798c0fb5dd8c05b2022226ec7d (diff) | |
| parent | 27e221f940ec3f98ccb716ed0aeb52cd8f77cfd5 (diff) | |
| download | android_hardware_broadcom_wlan-aeedec3f4d02ac45d90f3520d184742982801949.tar.gz android_hardware_broadcom_wlan-aeedec3f4d02ac45d90f3520d184742982801949.tar.bz2 android_hardware_broadcom_wlan-aeedec3f4d02ac45d90f3520d184742982801949.zip | |
am 27e221f9: bcm4329: Prevent deadlock in SPINWAIT_SLEEP() (b/2249878)
Merge commit '27e221f940ec3f98ccb716ed0aeb52cd8f77cfd5' into eclair-mr2-plus-aosp
* commit '27e221f940ec3f98ccb716ed0aeb52cd8f77cfd5':
bcm4329: Prevent deadlock in SPINWAIT_SLEEP() (b/2249878)
| -rw-r--r-- | bcm4329/src/dhd/sys/dhd.h | 4 |
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) |