diff options
| author | David S. Miller <davem@davemloft.net> | 2021-10-22 12:41:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-22 12:41:16 +0200 |
| commit | bdfa75ad70e93633e18b1ed2b3866c01aa9bf9d2 (patch) | |
| tree | 45115e9c988cbaa49f3766cbe6e6775757cb8c20 /drivers/nfc | |
| parent | Merge branch 'ax88796c-spi-ethernet-adapter' (diff) | |
| parent | Merge tag 'drm-fixes-2021-10-22' of git://anongit.freedesktop.org/drm/drm (diff) | |
| download | linux-bdfa75ad70e93633e18b1ed2b3866c01aa9bf9d2.tar.xz linux-bdfa75ad70e93633e18b1ed2b3866c01aa9bf9d2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Lots of simnple overlapping additions.
With a build fix from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/st95hf/core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c index d16cf3ff644e..b23f47936473 100644 --- a/drivers/nfc/st95hf/core.c +++ b/drivers/nfc/st95hf/core.c @@ -1226,11 +1226,9 @@ static int st95hf_remove(struct spi_device *nfc_spi_dev) &reset_cmd, ST95HF_RESET_CMD_LEN, ASYNC); - if (result) { + if (result) dev_err(&spictx->spidev->dev, "ST95HF reset failed in remove() err = %d\n", result); - return result; - } /* wait for 3 ms to complete the controller reset process */ usleep_range(3000, 4000); @@ -1239,7 +1237,7 @@ static int st95hf_remove(struct spi_device *nfc_spi_dev) if (stcontext->st95hf_supply) regulator_disable(stcontext->st95hf_supply); - return result; + return 0; } /* Register as SPI protocol driver */ |