diff options
author | Dave Airlie <airlied@redhat.com> | 2020-01-20 11:08:11 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-01-20 11:42:57 +1000 |
commit | 3d4743131b8de970faa4b979ead0fadfe5d2de9d (patch) | |
tree | 68e948c2d94d48598dd37e31bb654feb0b43ae4a /drivers/nfc/nxp-nci/i2c.c | |
parent | df95968ff78931576ac7a3d3b30312894aaaf22e (diff) | |
parent | def9d2780727cec3313ed3522d0123158d87224d (diff) | |
download | linux-3d4743131b8de970faa4b979ead0fadfe5d2de9d.tar.bz2 |
Backmerge v5.5-rc7 into drm-next
msm needs 5.5-rc4, go to the latest.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/nfc/nxp-nci/i2c.c')
-rw-r--r-- | drivers/nfc/nxp-nci/i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c index 4d1909aecd6c..9f60e4dc5a90 100644 --- a/drivers/nfc/nxp-nci/i2c.c +++ b/drivers/nfc/nxp-nci/i2c.c @@ -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)) { |