Merge remote-tracking branch 'regulator/for-linus' into regulator-next

2011-11-28 11:49:56 +00:00
parent 005d610f2a d4d6373c11
commit 9ee4be4156
450 changed files with 3846 additions and 3321 deletions
--- 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;