Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 231720
b: refs/heads/master
c: 52d039f
h: refs/heads/master
v: v3
  • Loading branch information
Dan Carpenter authored and David Woodhouse committed Jan 6, 2011
1 parent 1ff8d0c commit 3921960
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a121f643993474548fe98144514c50dd4f3dbe76
refs/heads/master: 52d039fdaa78c5a9f9bc2940ad58d7ed76b8336d
2 changes: 1 addition & 1 deletion trunk/drivers/mtd/nand/pxa3xx_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 3921960

Please sign in to comment.