NFC: nxp-nci: Fix probing without ACPI
authorStephan Gerhold <stephan@gerhold.net>
Mon, 9 Dec 2019 18:53:43 +0000 (19:53 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Dec 2019 04:15:17 +0000 (20:15 -0800)
devm_acpi_dev_add_driver_gpios() returns -ENXIO if CONFIG_ACPI
is disabled (e.g. on device tree platforms).
In this case, nxp-nci will silently fail to probe.

The other NFC drivers only log a debug message if
devm_acpi_dev_add_driver_gpios() fails.
Do the same in nxp-nci to fix this problem.

Fixes: ad0acfd69add ("NFC: nxp-nci: Get rid of code duplication in ->probe()")
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/nfc/nxp-nci/i2c.c

index 4d1909a..9f60e4d 100644 (file)
@@ -278,7 +278,7 @@ static int nxp_nci_i2c_probe(struct i2c_client *client,
 
        r = devm_acpi_dev_add_driver_gpios(dev, acpi_nxp_nci_gpios);
        if (r)
-               return r;
+               dev_dbg(dev, "Unable to add GPIO mapping table\n");
 
        phy->gpiod_en = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW);
        if (IS_ERR(phy->gpiod_en)) {