diff options
| author |   Hamish Martin <hamish.martin@alliedtelesis.co.nz> | 2020-03-10 10:16:18 +1300 |
|---|---|---|
| committer |   Wolfram Sang <wsa@the-dreams.de> | 2020-03-10 12:31:55 +0100 |
| commit | 3747cd2efe7ecb9604972285ab3f60c96cb753a8 (patch) | |
| tree | 89e55497abf94e2556c0136f38ceb97c6b35ec66 /drivers/i2c | |
| parent | macintosh: windfarm: fix MODINFO regression (diff) | |
| download | wireguard-linux-3747cd2efe7ecb9604972285ab3f60c96cb753a8.tar.xz wireguard-linux-3747cd2efe7ecb9604972285ab3f60c96cb753a8.zip | |
i2c: gpio: suppress error on probe defer
If a GPIO we are trying to use is not available and we are deferring
the probe, don't output an error message.
This seems to have been the intent of commit 05c74778858d
("i2c: gpio: Add support for named gpios in DT") but the error was
still output due to not checking the updated 'retdesc'.
Fixes: 05c74778858d ("i2c: gpio: Add support for named gpios in DT")
Signed-off-by: Hamish Martin <hamish.martin@alliedtelesis.co.nz>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c index 3a9e840a3546..a4a6825c8758 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c @@ -348,7 +348,7 @@ static struct gpio_desc *i2c_gpio_get_desc(struct device *dev, if (ret == -ENOENT) retdesc = ERR_PTR(-EPROBE_DEFER); - if (ret != -EPROBE_DEFER) + if (PTR_ERR(retdesc) != -EPROBE_DEFER) dev_err(dev, "error trying to get descriptor: %d\n", ret); return retdesc; |