]> git.baikalelectronics.ru Git - kernel.git/commit
spi: fix ctrl->num_chipselect constraint
authorTudor Ambarus <tudor.ambarus@microchip.com>
Wed, 19 Jun 2019 14:38:28 +0000 (14:38 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 20 Jun 2019 12:08:48 +0000 (13:08 +0100)
commite106853286f90afbcbcc9e4daec8632bf39ebc92
treedfb1557289c56d13b81665eef3390858196b4869
parent632144394125163f4b91b198571b0d817601a68d
spi: fix ctrl->num_chipselect constraint

at91sam9g25ek showed the following error at probe:
atmel_spi f0000000.spi: Using dma0chan2 (tx) and dma0chan3 (rx)
for DMA transfers
atmel_spi: probe of f0000000.spi failed with error -22

Commit 2c2b566173d5 ("spi: Don't call spi_get_gpio_descs() before device name is set")
moved the calling of spi_get_gpio_descs() after ctrl->dev is set,
but didn't move the !ctrl->num_chipselect check. When there are
chip selects in the device tree, the spi-atmel driver lets the
SPI core discover them when registering the SPI master.
The ctrl->num_chipselect is thus expected to be set by
spi_get_gpio_descs().

Move the !ctlr->num_chipselect after spi_get_gpio_descs() as it was
before the aforementioned commit. While touching this block, get rid
of the explicit comparison with 0 and update the commenting style.

Fixes: 2c2b566173d5 ("spi: Don't call spi_get_gpio_descs() before device name is set")
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi.c