diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 21:30:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 21:30:13 +0200 |
| commit | b78b6b3a9af239549ea863e085223d1d4f65a608 (patch) | |
| tree | fb55713cba98edd270df2c54a7590a2be7e1be10 /kernel/wait.c | |
| parent | net: ieee802154: convert class code to use dev_groups (diff) | |
| parent | Linux 3.11-rc3 (diff) | |
| download | linux-b78b6b3a9af239549ea863e085223d1d4f65a608.tar.xz linux-b78b6b3a9af239549ea863e085223d1d4f65a608.zip | |
Merge 3.11-rc3 into driver-core-next
We want these fixes in this branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/wait.c')
| -rw-r--r-- | kernel/wait.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/wait.c b/kernel/wait.c index ce0daa320a26..dec68bd4e9d8 100644 --- a/kernel/wait.c +++ b/kernel/wait.c @@ -333,7 +333,8 @@ int __wait_on_atomic_t(wait_queue_head_t *wq, struct wait_bit_queue *q, prepare_to_wait(wq, &q->wait, mode); val = q->key.flags; if (atomic_read(val) == 0) - ret = (*action)(val); + break; + ret = (*action)(val); } while (!ret && atomic_read(val) != 0); finish_wait(wq, &q->wait); return ret; |