Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 116015
b: refs/heads/master
c: 2675e94
h: refs/heads/master
i:
  116013: b598a24
  116011: 8c88cbe
  116007: 0f03636
  115999: 2bd8a85
v: v3
  • Loading branch information
Enrico Scholz authored and David Woodhouse committed Sep 1, 2008
1 parent 20b9e84 commit 5b237f7
Show file tree
Hide file tree
Showing 2 changed files with 5 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: c8c17c888d936c58ceb28b084a6272d67e10ea28
refs/heads/master: 2675e9447bb5c861dbd29c5fe55b7ce2ad3ff0f5
5 changes: 4 additions & 1 deletion trunk/drivers/mtd/nand/pxa3xx_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ static int pxa3xx_nand_detect_flash(struct pxa3xx_nand_info *info,
const struct pxa3xx_nand_platform_data *pdata)
{
const struct pxa3xx_nand_flash *f;
uint32_t id;
uint32_t id = -1;
int i;

for (i = 0; i<pdata->num_flash; ++i) {
Expand Down Expand Up @@ -956,6 +956,9 @@ static int pxa3xx_nand_detect_flash(struct pxa3xx_nand_info *info,
}
#endif

dev_warn(&info->pdev->dev,
"failed to detect configured nand flash; found %04x instead of\n",
id);
return -ENODEV;
}

Expand Down

0 comments on commit 5b237f7

Please sign in to comment.