aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-05 07:54:11 +1100
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-05 07:54:11 +1100
commitd92dd35920d51e1664f902be48e622307098d0d9 (patch)
treec3a45f67badc1b61c7cbb0522e602546d4dcdf08 /drivers/mtd/maps
parent6edacf05c8362f4c368991b55d85e8122cfc9a24 (diff)
parent0ce82b7f7b7373b16ecf7b5725e21e2975204500 (diff)
downloadkernel_goldelico_gta04-d92dd35920d51e1664f902be48e622307098d0d9.zip
kernel_goldelico_gta04-d92dd35920d51e1664f902be48e622307098d0d9.tar.gz
kernel_goldelico_gta04-d92dd35920d51e1664f902be48e622307098d0d9.tar.bz2
Merge tag 'for-linus-20130204' of git://git.infradead.org/linux-mtd
Pull MTD fixes from David Woodhouse: "A small set of simple regression and build fixes for 3.8: - Fix a warning introduced in ONFI NAND probe - Fix commandline partition parsing - Require BITREVERSE for DiskOnChip G3 driver - Fix build failure for davinci_nand as module - Bump NFLASH_READY_RETRIES for bcm47xxnflash" * tag 'for-linus-20130204' of git://git.infradead.org/linux-mtd: mtd: nand: onfi don't WARN if we are in 16 bits mode mtd: physmap_of: fix cmdline partition method w/o linux, mtd-name mtd: docg3 fix missing bitreverse lib mtd: davinci_nand: fix modular build with CONFIG_OF=y mtd: bcm47xxnflash: increase NFLASH_READY_RETRIES
Diffstat (limited to 'drivers/mtd/maps')
-rw-r--r--drivers/mtd/maps/physmap_of.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 67cc73c..7901d72 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -170,7 +170,7 @@ static int of_flash_probe(struct platform_device *dev)
resource_size_t res_size;
struct mtd_part_parser_data ppdata;
bool map_indirect;
- const char *mtd_name;
+ const char *mtd_name = NULL;
match = of_match_device(of_flash_match, &dev->dev);
if (!match)