| From 4b818b13d4b60780126061d4ba2c6536c4d9ed71 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 3 Jun 2020 17:26:10 +0800 |
| Subject: iio: amplifiers: ad8366: Change devm_gpiod_get() to optional and add |
| the missed check |
| |
| From: Chuhong Yuan <hslester96@gmail.com> |
| |
| [ Upstream commit 9ca39411f9a9c833727750431da8dfd96ff80005 ] |
| |
| Since if there is no GPIO, nothing happens, replace devm_gpiod_get() |
| with devm_gpiod_get_optional(). |
| Also add IS_ERR() to fix the missing-check warning. |
| |
| Fixes: cee211f4e5a0 ("iio: amplifiers: ad8366: Add support for the ADA4961 DGA") |
| Signed-off-by: Chuhong Yuan <hslester96@gmail.com> |
| Acked-by: Alexandru Ardelean <alexandru.ardelean@analog.com> |
| Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/iio/amplifiers/ad8366.c | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/iio/amplifiers/ad8366.c b/drivers/iio/amplifiers/ad8366.c |
| index 62167b87caea8..8345ba65d41d8 100644 |
| --- a/drivers/iio/amplifiers/ad8366.c |
| +++ b/drivers/iio/amplifiers/ad8366.c |
| @@ -262,8 +262,11 @@ static int ad8366_probe(struct spi_device *spi) |
| case ID_ADA4961: |
| case ID_ADL5240: |
| case ID_HMC1119: |
| - st->reset_gpio = devm_gpiod_get(&spi->dev, "reset", |
| - GPIOD_OUT_HIGH); |
| + st->reset_gpio = devm_gpiod_get_optional(&spi->dev, "reset", GPIOD_OUT_HIGH); |
| + if (IS_ERR(st->reset_gpio)) { |
| + ret = PTR_ERR(st->reset_gpio); |
| + goto error_disable_reg; |
| + } |
| indio_dev->channels = ada4961_channels; |
| indio_dev->num_channels = ARRAY_SIZE(ada4961_channels); |
| break; |
| -- |
| 2.25.1 |
| |
