diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 07:42:31 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 07:42:31 -0500 |
| commit | 20ab4a7a792bc9cc4a71c945a81743be96a12126 (patch) | |
| tree | 103ce8e8eb437cd99be972992be6c836161c39ae | |
| parent | 45aae62ddd1463cd89a036f9fdf213ff2b7910b0 (diff) | |
| parent | 09ca50d2ade7ed6b3b2653b771774cf360c3d56c (diff) | |
Merge remote-tracking branch 'regulator/topic/as3711' into regulator-next
| -rw-r--r-- | drivers/regulator/as3711-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/as3711-regulator.c b/drivers/regulator/as3711-regulator.c index 2f1341db38a0..f0ba8c4eefa9 100644 --- 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) | |||
| 303 | reg_data = pdata ? pdata->init_data[id] : NULL; | 303 | reg_data = pdata ? pdata->init_data[id] : NULL; |
| 304 | 304 | ||
| 305 | /* No need to register if there is no regulator data */ | 305 | /* No need to register if there is no regulator data */ |
| 306 | if (!ri->desc.name) | 306 | if (!reg_data) |
| 307 | continue; | 307 | continue; |
| 308 | 308 | ||
| 309 | reg = ®s[id]; | 309 | reg = ®s[id]; |