summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2012-05-16 16:50:06 -0700
committerOm Prakash Singh <omp@nvidia.com>2012-06-15 14:15:18 +0530
commit8e845f2e9a64546124381d8052c1867bbe9db785 (patch)
treea3ea0c4c04038c23e3dfac84390de1b0586db1bd /drivers/net
parentec02c20b7c417687c344457897abf41aac5ee087 (diff)
net: wireless: bcmdhd: Ignore signal_pending() while waiting in IOCTL
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/bcmdhd/dhd_linux.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c
index 95753e2f08d3..93050b882d12 100644
--- a/drivers/net/wireless/bcmdhd/dhd_linux.c
+++ b/drivers/net/wireless/bcmdhd/dhd_linux.c
@@ -3933,14 +3933,11 @@ dhd_os_ioctl_resp_wait(dhd_pub_t *pub, uint *condition, bool *pending)
* Can be changed by another processor.
*/
smp_mb();
- while (!(*condition) && (!signal_pending(current) && timeout)) {
+ while (!(*condition) && timeout) {
timeout = schedule_timeout(timeout);
smp_mb();
}
- if (signal_pending(current))
- *pending = TRUE;
-
set_current_state(TASK_RUNNING);
remove_wait_queue(&dhd->ioctl_resp_wait, &wait);