From 392196064251b48a88db29aaa526cbb06b9370c1 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 6 Jan 2011 17:05:36 +0300 Subject: [PATCH] --- yaml --- r: 231720 b: refs/heads/master c: 52d039fdaa78c5a9f9bc2940ad58d7ed76b8336d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/pxa3xx_nand.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0307f5382619..bd2bae94be60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a121f643993474548fe98144514c50dd4f3dbe76 +refs/heads/master: 52d039fdaa78c5a9f9bc2940ad58d7ed76b8336d diff --git a/trunk/drivers/mtd/nand/pxa3xx_nand.c b/trunk/drivers/mtd/nand/pxa3xx_nand.c index 17f8518cc5eb..ea2c288df3f6 100644 --- a/trunk/drivers/mtd/nand/pxa3xx_nand.c +++ b/trunk/drivers/mtd/nand/pxa3xx_nand.c @@ -885,6 +885,7 @@ static int pxa3xx_nand_detect_config(struct pxa3xx_nand_info *info) /* set info fields needed to __readid */ info->read_id_bytes = (info->page_size == 2048) ? 4 : 2; info->reg_ndcr = ndcr; + info->cmdset = &default_cmdset; if (__readid(info, &id)) return -ENODEV; @@ -915,7 +916,6 @@ static int pxa3xx_nand_detect_config(struct pxa3xx_nand_info *info) info->ndtr0cs0 = nand_readl(info, NDTR0CS0); info->ndtr1cs0 = nand_readl(info, NDTR1CS0); - info->cmdset = &default_cmdset; return 0; }