aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-03 18:28:21 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-04 06:39:03 -0400
commit8df8d8a03865b468318302ba9410aad92e94aaa6 (patch)
treedac46d7cfb00b4bec440c9dbd5134dbc3d250972
parent02b552160f955a6dd6a54600f262365dc8916d69 (diff)
regulator: isl6271a: Allow missing init_data for diagnostics
The regulator core supports this to allow the configuration to be inspected at runtime even if no software mangement is enabled. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Marek Vasut <marek.vasut@gmail.com>
-rw-r--r--drivers/regulator/isl6271a-regulator.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/regulator/isl6271a-regulator.c b/drivers/regulator/isl6271a-regulator.c
index 775f5fd208c3..6539ef9337cf 100644
--- a/drivers/regulator/isl6271a-regulator.c
+++ b/drivers/regulator/isl6271a-regulator.c
@@ -147,11 +147,6 @@ static int __devinit isl6271a_probe(struct i2c_client *i2c,
147 if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) 147 if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
148 return -EIO; 148 return -EIO;
149 149
150 if (!init_data) {
151 dev_err(&i2c->dev, "no platform data supplied\n");
152 return -EIO;
153 }
154
155 pmic = kzalloc(sizeof(struct isl_pmic), GFP_KERNEL); 150 pmic = kzalloc(sizeof(struct isl_pmic), GFP_KERNEL);
156 if (!pmic) 151 if (!pmic)
157 return -ENOMEM; 152 return -ENOMEM;