diff options
| author | Christophe Jaillet <christophe.jaillet@wanadoo.fr> | 2016-08-11 15:02:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-16 17:50:38 +0200 |
| commit | 8f730426896bb58cdf670a483451ad388c68a884 (patch) | |
| tree | 4962502829aaa5fce23a389e1dbab173c72d2372 | |
| parent | 2c3c81a10ab504fac76b8d17eb07481bd4350fbd (diff) | |
| download | linux-stable-8f730426896bb58cdf670a483451ad388c68a884.tar.gz linux-stable-8f730426896bb58cdf670a483451ad388c68a884.tar.bz2 linux-stable-8f730426896bb58cdf670a483451ad388c68a884.zip | |
ARM: cpuidle: Fix error return code
commit af48d7bc3756a0cd882d65bff14ab39746ba57fe upstream.
We know that 'ret = 0' because it has been tested a few lines above.
So, if 'kzalloc' fails, 0 will be returned instead of an error code.
Return -ENOMEM instead.
Fixes: a0d46a3dfdc3 ("ARM: cpuidle: Register per cpuidle device")
Signed-off-by: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/cpuidle/cpuidle-arm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c index e342565e8715..1855b9ee807f 100644 --- a/drivers/cpuidle/cpuidle-arm.c +++ b/drivers/cpuidle/cpuidle-arm.c @@ -135,6 +135,7 @@ static int __init arm_idle_init(void) dev = kzalloc(sizeof(*dev), GFP_KERNEL); if (!dev) { pr_err("Failed to allocate cpuidle device\n"); + ret = -ENOMEM; goto out_fail; } dev->cpu = cpu; |