Merge remote-tracking branch 'regulator/topic/as3711' into regulator-…

…next
git-mirror · Feb 19, 2013 · 20ab4a7 · 20ab4a7
2 parents 45aae62 + 09ca50d
commit 20ab4a7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/regulator/as3711-regulator.c b/drivers/regulator/as3711-regulator.c
@@ -303,7 +303,7 @@ static int as3711_regulator_probe(struct platform_device *pdev)
 		reg_data = pdata ? pdata->init_data[id] : NULL;
 
 		/* No need to register if there is no regulator data */
-		if (!ri->desc.name)
+		if (!reg_data)
 			continue;
 
 		reg = &regs[id];