diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 11:52:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 11:52:43 +1000 |
| commit | 802450e926d9c53f353776944cf6812bf3000a8d (patch) | |
| tree | 05175d5191ba734119ab6940aa23efb167a3c00f /drivers | |
| parent | 2b683922bb59fa0fc36d8e19b47f567baa1f0f7e (diff) | |
| parent | 00b275dbfc2ae3e3312a910736dd9a6bd5110c2b (diff) | |
Merge remote branch 'mtd/master'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/maps/physmap_of.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c index ba124baa646d..6ac5f9f28ac3 100644 --- a/drivers/mtd/maps/physmap_of.c +++ b/drivers/mtd/maps/physmap_of.c @@ -353,7 +353,7 @@ static int __devinit of_flash_probe(struct of_device *dev, &info->parts, 0); if (err < 0) { of_free_probes(part_probe_types); - return err; + goto err_out; } of_free_probes(part_probe_types); @@ -361,14 +361,14 @@ static int __devinit of_flash_probe(struct of_device *dev, if (err == 0) { err = of_mtd_parse_partitions(&dev->dev, dp, &info->parts); if (err < 0) - return err; + goto err_out; } #endif if (err == 0) { err = parse_obsolete_partitions(dev, info, dp); if (err < 0) - return err; + goto err_out; } if (err > 0) |