kernel: update kernel 3.18 to rc4

[openwrt/staging/chunkeey.git] / target / linux / bcm53xx / patches-3.18 / 402-mtd-spi-nor-allow-NULL-as-spi_device_id-in-spi_nor_s.patch

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
index de1e50625545682aee5916752356b266e61836cb..b72e2e26134ce275f4a01a623e6835e6c776bbf3 100644 (file)
--- 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
@@ -1,8 +1,8 @@
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -926,29 +926,23 @@ int spi_nor_scan(struct spi_nor *nor, co
-       if (ret)
-               return ret;
+@@ -931,29 +931,23 @@ int spi_nor_scan(struct spi_nor *nor, co
+       if (!id)
+               return -ENOENT;
  
 -      info = (void *)id->driver_data;
 -