Skip to contentSkip to conversation

spi: intel: Check number of chip selects after reading the descriptor

PATCH In review Mika Westerberg 2 participants 2 messages Feb 15, 2023 SPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 spi: intel: Check number of chip selects after reading the descriptor

The flash decriptor contains the number of flash components that we use to figure out how many flash chips there are connected. Therefore we need to read it first before deciding how many chip selects the controller has.

Fixes 3f03c618bebb ("spi: intel: Add support for second flash chip")
---
 drivers/spi/spi-intel.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/spi/spi-intel.c +4 -4
index f619212b0d5c..627287925fed 100644
@@ -1368,14 +1368,14 @@ static int intel_spi_populate_chip(struct intel_spi *ispi)
 	if (!spi_new_device(ispi->master, &chip))
 		return -ENODEV;
 
-	/* Add the second chip if present */
-	if (ispi->master->num_chipselect < 2)
-		return 0;
-
 	ret = intel_spi_read_desc(ispi);
 	if (ret)
 		return ret;
 
+	/* Add the second chip if present */
+	if (ispi->master->num_chipselect < 2)
+		return 0;
+
 	chip.platform_data = NULL;
 	chip.chip_select = 1;
 
Signature · 1 line
2.39.1
maintainer
#1 lore raw
Quoted 6 lines · Mika Westerberg

The flash decriptor contains the number of flash components that we use to figure out how many flash chips there are connected. Therefore we need to read it first before deciding how many chip selects the controller has.

Applied to

broonie/spi.git for-next

Thanks!

[1/1] spi: intel: Check number of chip selects after reading the descriptor

      commit: 574fbb95cd9d88bdc9c9c4c64223a38a61d7de9a

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark