From 9de869b187feab94c0850bfd6fa13db6662b50d0 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Mon, 24 Sep 2012 20:40:47 -0700 Subject: [PATCH] --- yaml --- r: 332775 b: refs/heads/master c: 47450b35915c45309974c74f11c2d236db1b950f h: refs/heads/master i: 332773: c0456362c30dbd8af19c827ab45b958db3208333 332771: 8021bcc45980e310ea1d20f51ab2bf00e7a1796c 332767: b8ad64ebc00be098c902777937201d852df6688f v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/nand_base.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3bbae9afd455..8161aead85d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5570f0c873e3be68a66b479308f21d2dc280a1c +refs/heads/master: 47450b35915c45309974c74f11c2d236db1b950f diff --git a/trunk/drivers/mtd/nand/nand_base.c b/trunk/drivers/mtd/nand/nand_base.c index d06a80d4ee75..d4107848ec0a 100644 --- a/trunk/drivers/mtd/nand/nand_base.c +++ b/trunk/drivers/mtd/nand/nand_base.c @@ -2916,7 +2916,6 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, { int i, maf_idx; u8 id_data[8]; - int ret; /* Select the device */ chip->select_chip(mtd, 0); @@ -2963,8 +2962,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, chip->onfi_version = 0; if (!type->name || !type->pagesize) { /* Check is chip is ONFI compliant */ - ret = nand_flash_detect_onfi(mtd, chip, &busw); - if (ret) + if (nand_flash_detect_onfi(mtd, chip, &busw)) goto ident_done; }