mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-09-22 09:34:56 +02:00
mtd: mchp23k256: use SPI match data for chip caps
commitd322e40f4eupstream. The driver stores chip capacity information in both the OF match table and the SPI id table. Probe currently uses of_device_get_match_data(), so a non-OF SPI modalias match falls back to mchp23k256_caps even when the SPI id table selected a different part. Use spi_get_device_match_data() so SPI id-table driver_data is consumed when OF match data is absent. This keeps the existing default fallback while avoiding the wrong MTD geometry for id-table-only matches. Fixes:4379075a87("mtd: mchp23k256: Add support for mchp23lcv1024") Cc: stable@vger.kernel.org Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
35568121ad
commit
7c0a3a73dc
@@ -188,7 +188,7 @@ static int mchp23k256_probe(struct spi_device *spi)
|
||||
|
||||
data = dev_get_platdata(&spi->dev);
|
||||
|
||||
flash->caps = of_device_get_match_data(&spi->dev);
|
||||
flash->caps = spi_get_device_match_data(spi);
|
||||
if (!flash->caps)
|
||||
flash->caps = &mchp23k256_caps;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user