diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-05-16 16:50:06 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-05-16 16:59:37 -0700 |
| commit | 605a493298348eb2e9e2efc8a6c1b0297c13fe46 (patch) | |
| tree | 9dcfdd9d4676593ddd5c280f4a2dbaba1dc5ecbb | |
| parent | f242b6d8ac73c4b4b37e7dd376906dad1f624c41 (diff) | |
| download | kernel_samsung_aries-605a493298348eb2e9e2efc8a6c1b0297c13fe46.zip kernel_samsung_aries-605a493298348eb2e9e2efc8a6c1b0297c13fe46.tar.gz kernel_samsung_aries-605a493298348eb2e9e2efc8a6c1b0297c13fe46.tar.bz2 | |
net: wireless: bcmdhd: Ignore signal_pending() while waiting in IOCTL
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_linux.c | 5 |
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 8a9f795..69189f8 100644 --- a/drivers/net/wireless/bcmdhd/dhd_linux.c +++ b/drivers/net/wireless/bcmdhd/dhd_linux.c @@ -3931,14 +3931,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); |