mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] ata: ide-sff: don't call free for ide_port in error path
Date: Wed, 18 Jan 2017 12:01:53 +0100	[thread overview]
Message-ID: <20170118110153.xc76525xzcaw74n7@pengutronix.de> (raw)
In-Reply-To: <20161219191845.17226-1-u.kleine-koenig@pengutronix.de>

On Mon, Dec 19, 2016 at 08:18:45PM +0100, Uwe Kleine-König wrote:
> 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@pengutronix.de>
> ---
>  drivers/ata/ide-sff.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)

Applied, thanks

Sascha

> 
> 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
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      parent reply	other threads:[~2017-01-18 11:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-19 19:18 Uwe Kleine-König
2017-01-09 10:27 ` Sascha Hauer
2017-01-18 11:01 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170118110153.xc76525xzcaw74n7@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=u.kleine-koenig@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox