summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2015-09-09 16:57:39 -0700
committerBrian Norris <computersforpeace@gmail.com>2015-09-09 16:57:39 -0700
commitf9b97fe61402f7f18da71e034b1e72f68df82c1a (patch)
treec6063152fee1103b1f54f2d93b12273c8d39f1e6
parent7eadd47fd708df2028877558d085f47dc9086459 (diff)
parent2ff46e6fea6254ac8fa97aeb9c14e51436ab95f6 (diff)
Merge MTD 4.3-rc1 updates into -next
-rw-r--r--drivers/mtd/spi-nor/spi-nor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 834a06049ca2..55c67a4ea231 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -1219,7 +1219,7 @@ static const struct flash_info *spi_nor_match_id(const char *name)
{
const struct flash_info *id = spi_nor_ids;
- while (id->name[0]) {
+ while (id->name) {
if (!strcmp(name, id->name))
return id;
id++;