diff options
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18/402-mtd-spi-nor-allow-NULL-as-spi_device_id-in-spi_nor_s.patch')
| -rw-r--r-- | target/linux/bcm53xx/patches-3.18/402-mtd-spi-nor-allow-NULL-as-spi_device_id-in-spi_nor_s.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/402-mtd-spi-nor-allow-NULL-as-spi_device_id-in-spi_nor_s.patch b/target/linux/bcm53xx/patches-3.18/402-mtd-spi-nor-allow-NULL-as-spi_device_id-in-spi_nor_s.patch deleted file mode 100644 index b72e2e2613..0000000000 --- a/target/linux/bcm53xx/patches-3.18/402-mtd-spi-nor-allow-NULL-as-spi_device_id-in-spi_nor_s.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -931,29 +931,23 @@ int spi_nor_scan(struct spi_nor *nor, co - if (!id) - return -ENOENT; - -- info = (void *)id->driver_data; -- -- if (info->jedec_id) { -- const struct spi_device_id *jid; -- -- jid = nor->read_id(nor); -- if (IS_ERR(jid)) { -- return PTR_ERR(jid); -- } else if (jid != id) { -- /* -- * JEDEC knows better, so overwrite platform ID. We -- * can't trust partitions any longer, but we'll let -- * mtd apply them anyway, since some partitions may be -- * marked read-only, and we don't want to lose that -- * information, even if it's not 100% accurate. -- */ -- dev_warn(dev, "found %s, expected %s\n", -- jid->name, id->name); -- id = jid; -- info = (void *)jid->driver_data; -+ if (id) { -+ info = (void *)id->driver_data; -+ if (info->jedec_id) { -+ dev_warn(dev, -+ "passed SPI device ID (%s) contains JEDEC, ignoring it, driver should be fixed!\n", -+ id->name); -+ id = NULL; - } - } - -+ if (!id) { -+ id = nor->read_id(nor); -+ if (IS_ERR(id)) -+ return PTR_ERR(id); -+ } -+ info = (void *)id->driver_data; -+ - mutex_init(&nor->lock); - - /* |