diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2014-07-21 08:59:16 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-07-21 09:01:16 +0200 |
| commit | d0d5864676dbccfb1337864a0ae6ce97e6342678 (patch) | |
| tree | 7caa674ec05a1797054cd4304f0a047b6dacddd6 /drivers/macintosh/smu.c | |
| parent | mtd: cfi_cmdset_0002: fix do_write_buffer() timeout error (diff) | |
| parent | Linux 3.16-rc6 (diff) | |
| download | linux-d0d5864676dbccfb1337864a0ae6ce97e6342678.tar.xz linux-d0d5864676dbccfb1337864a0ae6ce97e6342678.zip | |
Merge tag 'v3.16-rc6' into MTD development branch
Linux 3.16-rc6
Diffstat (limited to 'drivers/macintosh/smu.c')
| -rw-r--r-- | drivers/macintosh/smu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index 23b4a3b28dbc..4eab93aa570b 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c @@ -1257,7 +1257,8 @@ static unsigned int smu_fpoll(struct file *file, poll_table *wait) if (pp->busy && pp->cmd.status != 1) mask |= POLLIN; spin_unlock_irqrestore(&pp->lock, flags); - } if (pp->mode == smu_file_events) { + } + if (pp->mode == smu_file_events) { /* Not yet implemented */ } return mask; |