diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 14:40:08 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 14:40:08 -0400 |
| commit | 76962be8491b18ae7ff4fd6a4accd398bdb402a2 (patch) | |
| tree | 976958bf8e4989a69901bfbb25dd6463728c6cb5 /kernel/padata.c | |
| parent | 5e27fb78df95e027723af2c90ecc9b4527ae59e9 (diff) | |
| parent | d30e5d897c3da7c2d17c8112331b66ed953eec78 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'kernel/padata.c')
| -rw-r--r-- | kernel/padata.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/padata.c b/kernel/padata.c index b1c9857f8402..fdd8ae609ce3 100644 --- a/kernel/padata.c +++ b/kernel/padata.c | |||
| @@ -659,7 +659,7 @@ static int padata_cpu_callback(struct notifier_block *nfb, | |||
| 659 | err = __padata_add_cpu(pinst, cpu); | 659 | err = __padata_add_cpu(pinst, cpu); |
| 660 | mutex_unlock(&pinst->lock); | 660 | mutex_unlock(&pinst->lock); |
| 661 | if (err) | 661 | if (err) |
| 662 | return NOTIFY_BAD; | 662 | return notifier_from_errno(err); |
| 663 | break; | 663 | break; |
| 664 | 664 | ||
| 665 | case CPU_DOWN_PREPARE: | 665 | case CPU_DOWN_PREPARE: |
| @@ -670,7 +670,7 @@ static int padata_cpu_callback(struct notifier_block *nfb, | |||
| 670 | err = __padata_remove_cpu(pinst, cpu); | 670 | err = __padata_remove_cpu(pinst, cpu); |
| 671 | mutex_unlock(&pinst->lock); | 671 | mutex_unlock(&pinst->lock); |
| 672 | if (err) | 672 | if (err) |
| 673 | return NOTIFY_BAD; | 673 | return notifier_from_errno(err); |
| 674 | break; | 674 | break; |
| 675 | 675 | ||
| 676 | case CPU_UP_CANCELED: | 676 | case CPU_UP_CANCELED: |