diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-09-10 16:12:02 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-09-10 16:12:02 +1000 |
| commit | 4eeab1a6f5cc13ec0582c4c1cec2f2087b40a980 (patch) | |
| tree | f607d5a78501580a5f6d5d3d202b0c1264c47d46 /fs | |
| parent | 297b5f9352d67dfe4617f20a75b7f46f1e5cd618 (diff) | |
| parent | 69843f8383fa86ca73fe5f557b6c87becad895d1 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/timerfd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/timerfd.c b/fs/timerfd.c index 80c350216ea8..b46ffa94372a 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -333,8 +333,7 @@ static long timerfd_ioctl(struct file *file, unsigned int cmd, unsigned long arg spin_lock_irq(&ctx->wqh.lock); if (!timerfd_canceled(ctx)) { ctx->ticks = ticks; - if (ticks) - wake_up_locked(&ctx->wqh); + wake_up_locked(&ctx->wqh); } else ret = -ECANCELED; spin_unlock_irq(&ctx->wqh.lock); |