diff options
| author |   Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2021-10-19 22:49:16 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-10-20 14:41:20 +0100 |
| commit | 641e3fd1a038c68045bbf89d78502f4b4bbc7284 (patch) | |
| tree | 5a4acdbf1474685864e8b96b7068ba0b8cf61863 /drivers/nfc/st95hf | |
| parent | Merge branch 'hns3-fixes' (diff) | |
| download | linux-dev-641e3fd1a038c68045bbf89d78502f4b4bbc7284.tar.xz linux-dev-641e3fd1a038c68045bbf89d78502f4b4bbc7284.zip | |
nfc: st95hf: Make spi remove() callback return zero
If something goes wrong in the remove callback, returning an error code
just results in an error message. The device still disappears.
So don't skip disabling the regulator in st95hf_remove() if resetting
the controller via spi fails. Also don't return an error code which just
results in two error messages.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nfc/st95hf')
| -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 */ |