]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regu...
authorAxel Lin <axel.lin@gmail.com>
Mon, 28 Nov 2011 06:06:31 +0000 (14:06 +0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 9 Dec 2011 16:54:22 +0000 (08:54 -0800)
commit d4d6373c1109b11c8118340be97ae31b8f94d66a upstream.

In current implementation, the pointer ri is not NULL if no id is matched.
Fix it by checking i == ARRAY_SIZE(aat2870_regulators) if no id is matched.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/regulator/aat2870-regulator.c

index cd4104542f0dc26ee0f7573556ad73c04dedc707..11d1ab4abefaff800db3f8495872b8bd10bec550 100644 (file)
@@ -159,7 +159,7 @@ static struct aat2870_regulator *aat2870_get_regulator(int id)
                        break;
        }
 
-       if (!ri)
+       if (i == ARRAY_SIZE(aat2870_regulators))
                return NULL;
 
        ri->enable_addr = AAT2870_LDO_EN;