[PATCH] ata: ide-sff: don't call free for ide_port in error path

Uwe Kleine-König u.kleine-koenig at pengutronix.de
Mon Dec 19 11:18:45 PST 2016


The ide_port is provided by the caller so it's not in the responsibility
of this function to free this memory in case of error.
Actually all callers do the free themselves, too.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
---
 drivers/ata/ide-sff.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/ata/ide-sff.c b/drivers/ata/ide-sff.c
index e32cc3fc24f8..6dc89d79a543 100644
--- a/drivers/ata/ide-sff.c
+++ b/drivers/ata/ide-sff.c
@@ -389,11 +389,10 @@ int ide_port_register(struct ide_port *ide)
 	ide->port.ops = &ide_ops;
 
 	ret = ata_port_register(&ide->port);
-	if (!ret)
-		ata_port_detect(&ide->port);
-
 	if (ret)
-		free(ide);
+		return ret;
+
+	ata_port_detect(&ide->port);
 
-	return ret;
+	return 0;
 }
-- 
2.11.0




More information about the barebox mailing list