From: Boris Brezillon <boris.brezillon@bootlin.com>
Date: Fri, 19 Oct 2018 07:49:01 +0000 (+0200)
Subject: mtd: maps: physmap: Return -ENOMEM directly when info allocation fails
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7abe5309de76337920f103d9e34ebd42a479533b;p=openwrt%2Fstaging%2Fblogic.git

mtd: maps: physmap: Return -ENOMEM directly when info allocation fails

There's no point going to the err_out path since no resources have
been allocated yet, just return -ENOMEM directly.

Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 9b34223c4635..7d30f3524d35 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -110,10 +110,8 @@ static int physmap_flash_probe(struct platform_device *dev)
 
 	info = devm_kzalloc(&dev->dev, sizeof(struct physmap_flash_info),
 			    GFP_KERNEL);
-	if (info == NULL) {
-		err = -ENOMEM;
-		goto err_out;
-	}
+	if (!info)
+		return -ENOMEM;
 
 	while (platform_get_resource(dev, IORESOURCE_MEM, info->nmaps))
 		info->nmaps++;