[PATCH v6 1/1] iio:pressure:ms5611: fix crash when probing regulator
From: Gregor Boirie <hidden>
Date: 2016-03-09 11:34:07
Also in:
linux-iio
Subsystem:
iio subsystem and drivers, the rest · Maintainers:
Jonathan Cameron, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-03-12 · Re: [PATCH v6 1/1] iio:pressure:ms5611: fix crash when probing regulator · Jonathan Cameron <hidden>
When not compiled-in, regulator layer will return a NULL pointer when
trying to get a reference to any regulator using devm_regulator_get(). As
IS_ERR() does not consider this an error, the ms5611 probing operation will
try to enable a NULL regulator, which will invariably cause a kernel
crash.
This patch fixes this situation by using devm_regulator_get_optional()
instead of devm_regulator_get().
Fixes: 3145229f9191 ("iio:pressure:ms5611: power regulator support")
Signed-off-by: Gregor Boirie <gregor.boirie-ITF29qwbsa/QT0dZR+AlfA@public.gmane.org>
---
drivers/iio/pressure/ms5611_core.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/pressure/ms5611_core.c b/drivers/iio/pressure/ms5611_core.c
index 37dbc04..a2a871b 100644
--- a/drivers/iio/pressure/ms5611_core.c
+++ b/drivers/iio/pressure/ms5611_core.c@@ -387,8 +387,8 @@ static const struct iio_info ms5611_info = { static int ms5611_init(struct iio_dev *indio_dev) { int ret; - struct regulator *vdd = devm_regulator_get(indio_dev->dev.parent, - "vdd"); + struct regulator *vdd = + devm_regulator_get_optional(indio_dev->dev.parent, "vdd"); /* Enable attached regulator if any. */ if (!IS_ERR(vdd)) {
@@ -398,6 +398,10 @@ static int ms5611_init(struct iio_dev *indio_dev) "failed to enable Vdd supply: %d\n", ret); return ret; } + } else { + ret = PTR_ERR(vdd); + if (ret != -ENODEV) + return ret; } ret = ms5611_reset(indio_dev);
--
2.1.4