diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2009-11-17 16:06:02 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-17 16:06:02 -0800 |
commit | 626f7e6596023c5a099a2bfd051d1994d79162d3 (patch) | |
tree | 59b232c99e12cf240e9288baebb33371c689f246 | |
parent | 5d6615609f696dd8e61ad9eff6a98bc68d99f538 (diff) | |
parent | c6a5b78e93ceba2e2039393ea7cc8964da7ea2a5 (diff) | |
download | ti-626f7e6596023c5a099a2bfd051d1994d79162d3.tar.gz |
am c6a5b78e: tnetw1271: Wait for command completion with 10 sec timeout
Merge commit 'c6a5b78e93ceba2e2039393ea7cc8964da7ea2a5' into eclair-mr2-plus-aosp
* commit 'c6a5b78e93ceba2e2039393ea7cc8964da7ea2a5':
tnetw1271: Wait for command completion with 10 sec timeout
-rw-r--r-- | wilink_6_1/platforms/os/linux/src/osapi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wilink_6_1/platforms/os/linux/src/osapi.c b/wilink_6_1/platforms/os/linux/src/osapi.c index 4ad5646..8a84596 100644 --- a/wilink_6_1/platforms/os/linux/src/osapi.c +++ b/wilink_6_1/platforms/os/linux/src/osapi.c @@ -760,7 +760,10 @@ int os_SignalObjectWait (TI_HANDLE OsContext, void *signalObject) { if (!signalObject) return TI_NOK; - wait_for_completion ((struct completion *)signalObject); + if (!wait_for_completion_timeout((struct completion *)signalObject, + msecs_to_jiffies(10000))) { + printk("tiwlan: 10 sec %s timeout\n", __func__); + } return TI_OK; } |