Commit 641e3fd1 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by David S. Miller
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 323e9a95

drivers/nfc/st95hf/core.c

+2 −4
Original line number Diff line number Diff line
@@ -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 */