diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2014-02-20 09:53:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-20 12:54:59 +0100 |
| commit | 516add1d9d504c5345c7ffb32f99d9343609fddf (patch) | |
| tree | 875ad12f482551d86149e038d69920cc38052bd7 /drivers/regulator/tps6524x-regulator.c | |
| parent | Linus 3.14-rc1 (diff) | |
| download | linux-516add1d9d504c5345c7ffb32f99d9343609fddf.tar.xz linux-516add1d9d504c5345c7ffb32f99d9343609fddf.zip | |
regulator: tps6524x: Remove redundant error message
kzalloc prints its own OOM message upon failure.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/tps6524x-regulator.c')
| -rw-r--r-- | drivers/regulator/tps6524x-regulator.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c index 9f6bfda711b7..5b494db9f95c 100644 --- a/drivers/regulator/tps6524x-regulator.c +++ b/drivers/regulator/tps6524x-regulator.c @@ -593,10 +593,9 @@ static int pmic_probe(struct spi_device *spi) } hw = devm_kzalloc(&spi->dev, sizeof(struct tps6524x), GFP_KERNEL); - if (!hw) { - dev_err(dev, "cannot allocate regulator private data\n"); + if (!hw) return -ENOMEM; - } + spi_set_drvdata(spi, hw); memset(hw, 0, sizeof(struct tps6524x)); |