Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 97699
b: refs/heads/master
c: ba75321
h: refs/heads/master
i:
  97697: 051d13d
  97695: dddd85e
v: v3
  • Loading branch information
Kyungmin Park authored and David Woodhouse committed Jun 5, 2008
1 parent 6b39600 commit bf3f816
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9b62d864314736fb6cc5c5db5b964d4a3c093424
refs/heads/master: ba75321193900a236bc5bbc29145e1039f74eb1b
2 changes: 1 addition & 1 deletion trunk/drivers/mtd/maps/omap_nor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ static int __init omapflash_probe(struct platform_device *pdev)
err = parse_mtd_partitions(info->mtd, part_probes, &info->parts, 0);
if (err > 0)
add_mtd_partitions(info->mtd, info->parts, err);
else if (err < 0 && pdata->parts)
else if (err <= 0 && pdata->parts)
add_mtd_partitions(info->mtd, pdata->parts, pdata->nr_parts);
else
#endif
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/mtd/onenand/generic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ static int __devinit generic_onenand_probe(struct device *dev)
err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0);
if (err > 0)
add_mtd_partitions(&info->mtd, info->parts, err);
else if (err < 0 && pdata->parts)
else if (err <= 0 && pdata->parts)
add_mtd_partitions(&info->mtd, pdata->parts, pdata->nr_parts);
else
#endif
Expand Down

0 comments on commit bf3f816

Please sign in to comment.