diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-11 07:38:12 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-11 07:38:12 +0200 |
| commit | 5b97259220cae53b174817aab6ab1ff1b616aaf3 (patch) | |
| tree | 69cc121a6a933518bb8c65ad96828d4e1f8778dc /drivers | |
| parent | powerpc/85xx: drop hypervisor specific board compatibles (diff) | |
| parent | powerpc/perf: Never program book3s PMCs with values >= 0x80000000 (diff) | |
| download | linux-5b97259220cae53b174817aab6ab1ff1b616aaf3.tar.xz linux-5b97259220cae53b174817aab6ab1ff1b616aaf3.zip | |
Merge branch 'merge' into next
Diffstat (limited to 'drivers')
| -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; |