From 2d510f490d6dbdb944c920dbaaa0a043fe365af7 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Tue, 1 Jun 2010 16:34:20 +0200 Subject: [PATCH] --- yaml --- r: 207743 b: refs/heads/master c: 00b275dbfc2ae3e3312a910736dd9a6bd5110c2b h: refs/heads/master i: 207741: c8bd4122c6e3e0fa5d6ac0bb1659516ad2b9fc2c 207739: eecff14d436f364823908bc4f50be4703cbf874f 207735: 9d17a0e0bbbeb3118308e084f87888dada790c6d 207727: c1ffc8baba0ee338f33cc59ef52dc453036ef455 207711: 6a13f0542963322178a8e7d6ab0607554c66d6bb 207679: 652f8c23fe2a2ec3a1823f0e2e8caadb80d74725 207615: 2cf588617a9837f0dfa716d3430358f492eaa32b v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/physmap_of.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 95677df7c5e3..5bb332a6a635 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b51adeae29d1ca07090d4f9c9c886499351e0129 +refs/heads/master: 00b275dbfc2ae3e3312a910736dd9a6bd5110c2b diff --git a/trunk/drivers/mtd/maps/physmap_of.c b/trunk/drivers/mtd/maps/physmap_of.c index 36dbcee1ac29..859664ad9e78 100644 --- a/trunk/drivers/mtd/maps/physmap_of.c +++ b/trunk/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)