From: Axel Lin Date: Mon, 28 Nov 2011 06:06:31 +0000 (+0800) Subject: regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regu... X-Git-Tag: MMI-PSA29.97-13-9~17946^2~2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d4d6373c1109b11c8118340be97ae31b8f94d66a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator 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 Signed-off-by: Mark Brown Cc: stable@kernel.org --- diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c index 5abeb3ac3e8d..298c6c6a2795 100644 --- a/drivers/regulator/aat2870-regulator.c +++ b/drivers/regulator/aat2870-regulator.c @@ -160,7 +160,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;