diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 22:52:12 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 22:52:12 (GMT) |
commit | ca17749259d26f7ddbb0678790d5d534018d0a6b (patch) | |
tree | 730e0bd336e78d673760df2b4116277af1c8c495 /drivers/char | |
parent | 07584d4a356ef52c084e1e4fedc22858ffc2f8b2 (diff) | |
parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
download | linux-ca17749259d26f7ddbb0678790d5d534018d0a6b.tar.xz |
Merge 3.16-rc5 into tty-next.
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/i8k.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c index d915707..93dcad0 100644 --- a/drivers/char/i8k.c +++ b/drivers/char/i8k.c @@ -138,7 +138,9 @@ static int i8k_smm(struct smm_regs *regs) if (!alloc_cpumask_var(&old_mask, GFP_KERNEL)) return -ENOMEM; cpumask_copy(old_mask, ¤t->cpus_allowed); - set_cpus_allowed_ptr(current, cpumask_of(0)); + rc = set_cpus_allowed_ptr(current, cpumask_of(0)); + if (rc) + goto out; if (smp_processor_id() != 0) { rc = -EBUSY; goto out; |