Merge tag 'v4.20' into next

[sfrench/cifs-2.6.git] / drivers / input / misc / rotary_encoder.c

diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index 30ec77ad32c6efa6a56637246e342bad5b7e93b1..d748897bf5e92f46399fd3ad84237f53a2ceca70 100644 (file)
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c
@@ -240,8 +240,10 @@ static int rotary_encoder_probe(struct platform_device *pdev)
 
        encoder->gpios = devm_gpiod_get_array(dev, NULL, GPIOD_IN);
        if (IS_ERR(encoder->gpios)) {
-               dev_err(dev, "unable to get gpios\n");
-               return PTR_ERR(encoder->gpios);
+               err = PTR_ERR(encoder->gpios);
+               if (err != -EPROBE_DEFER)
+                       dev_err(dev, "unable to get gpios: %d\n", err);
+               return err;
        }
        if (encoder->gpios->ndescs < 2) {
                dev_err(dev, "not enough gpios found\n");