diff options
| author | Tudor Ambarus <tudor.ambarus@microchip.com> | 2019-06-19 14:38:28 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-20 13:08:48 +0100 |
| commit | f9481b08220d7dc1ff21e296a330ee8b721b44e4 (patch) | |
| tree | dfb1557289c56d13b81665eef3390858196b4869 /drivers/spi/spi.c | |
| parent | 51c711f2c38a412aaeda43c8167fe41877cf414d (diff) | |
| download | linux-f9481b08220d7dc1ff21e296a330ee8b721b44e4.tar.gz | |
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 0a919ae49223 ("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: 0a919ae49223 ("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>
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index a31e1e291335..80d2d14f6294 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2375,11 +2375,6 @@ int spi_register_controller(struct spi_controller *ctlr) if (status) return status; - /* even if it's just one always-selected device, there must - * be at least one chipselect - */ - if (ctlr->num_chipselect == 0) - return -EINVAL; if (ctlr->bus_num >= 0) { /* devices with a fixed bus num must check-in with the num */ mutex_lock(&board_lock); @@ -2450,6 +2445,13 @@ int spi_register_controller(struct spi_controller *ctlr) } } + /* + * Even if it's just one always-selected device, there must + * be at least one chipselect. + */ + if (!ctlr->num_chipselect) + return -EINVAL; + status = device_add(&ctlr->dev); if (status < 0) { /* free bus id */ |