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

20ab4a7a · Mark Brown · 45aae62d · 09ca50d2 · 20ab4a7a
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

drivers/regulator/as3711-regulator.c drivers/regulator/as3711-regulator.c +1 -1

未找到文件。
--- 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];