diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-11-10 22:51:30 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-11-10 22:51:30 +0000 |
| commit | c0fd27ae720f08b264115b8cfbce414662a96c89 (patch) | |
| tree | 1d88b4adbd31efda3ca82dd3a8ed689bc08661f8 /target/linux/bcm53xx/patches-3.18/402-mtd-spi-nor-allow-NULL-as-spi_device_id-in-spi_nor_s.patch | |
| parent | b59385e75e3136af064941364b341b8658397960 (diff) | |
| download | upstream-c0fd27ae720f08b264115b8cfbce414662a96c89.tar.gz upstream-c0fd27ae720f08b264115b8cfbce414662a96c89.tar.bz2 upstream-c0fd27ae720f08b264115b8cfbce414662a96c89.zip | |
kernel: update kernel 3.18 to rc4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43229 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 | 6 |
1 files changed, 3 insertions, 3 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 index de1e506255..b72e2e2613 100644 --- 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; - |