| Message ID | 20190816165000.32334-1-andreas@kemnade.info (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | df451f83e1fc0fa3764a2724b0faaaf9d07ab1b6 |
| Headers | show |
| Series | gpio: of: fix Freescale SPI CS quirk handling | expand |
On Fri, Aug 16, 2019 at 6:50 PM Andreas Kemnade <andreas@kemnade.info> wrote: > On the gta04 we see: > spi_gpio: probe of spi_lcd failed with error -2 > > The quirk introduced in > commit e3023bf80639 ("gpio: of: Handle the Freescale SPI CS") > can also be triggered by a temporary -EPROBE_DEFER and > so "convert" it to a hard -ENOENT. > > Disable that conversion by checking for -EPROBE_DEFER. > > Fixes: e3023bf80639 ("gpio: of: Handle the Freescale SPI CS") > Suggested-by: H. Nikolaus Schaller <hns@goldelico.com> > Signed-off-by: Andreas Kemnade <andreas@kemnade.info> Good catch! Patch applied for fixes. Yours, Linus Walleij
Hello: The following patches were marked "accepted", because they were applied to broonie/spi.git (refs/heads/for-next): Patch: gpio: of: fix Freescale SPI CS quirk handling Submitter: Andreas Kemnade <andreas@kemnade.info> Patchwork: https://patchwork.kernel.org/project/spi-devel-general/list/?series=160963 Total patches: 1
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 567fb98c0892..9762dd6d99fa 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -363,7 +363,7 @@ struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, /* Special handling for SPI GPIOs if used */ if (IS_ERR(desc)) desc = of_find_spi_gpio(dev, con_id, &of_flags); - if (IS_ERR(desc)) { + if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER) { /* This quirk looks up flags and all */ desc = of_find_spi_cs_gpio(dev, con_id, idx, flags); if (!IS_ERR(desc))
On the gta04 we see: spi_gpio: probe of spi_lcd failed with error -2 The quirk introduced in commit e3023bf80639 ("gpio: of: Handle the Freescale SPI CS") can also be triggered by a temporary -EPROBE_DEFER and so "convert" it to a hard -ENOENT. Disable that conversion by checking for -EPROBE_DEFER. Fixes: e3023bf80639 ("gpio: of: Handle the Freescale SPI CS") Suggested-by: H. Nikolaus Schaller <hns@goldelico.com> Signed-off-by: Andreas Kemnade <andreas@kemnade.info> --- drivers/gpio/gpiolib-of.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)