Commit cea8d9e4 authored by Matheus Tavares's avatar Matheus Tavares Committed by Greg Kroah-Hartman

staging:iio:ad2s90: Make probe handle spi_setup failure

[ Upstream commit b3a3eafe ]

Previously, ad2s90_probe ignored the return code from spi_setup, not
handling its possible failure. This patch makes ad2s90_probe check if
the code is an error code and, if so, do the following:

- Call dev_err with an appropriate error message.
- Return the spi_setup's error code.

Note: The 'return ret' statement could be out of the 'if' block, but
this whole block will be moved up in the function in the patch:
'staging:iio:ad2s90: Move device registration to the end of probe'.
Signed-off-by: default avatarMatheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 88eb7bc5
...@@ -86,7 +86,12 @@ static int ad2s90_probe(struct spi_device *spi) ...@@ -86,7 +86,12 @@ static int ad2s90_probe(struct spi_device *spi)
/* need 600ns between CS and the first falling edge of SCLK */ /* need 600ns between CS and the first falling edge of SCLK */
spi->max_speed_hz = 830000; spi->max_speed_hz = 830000;
spi->mode = SPI_MODE_3; spi->mode = SPI_MODE_3;
spi_setup(spi); ret = spi_setup(spi);
if (ret < 0) {
dev_err(&spi->dev, "spi_setup failed!\n");
return ret;
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment