From: Sergei Shtylyov <sshtylyov@mvista.com>
To: Vasiliy Kulikov <segooon@gmail.com>, Jeff Garzik <jgarzik@pobox.com>
Cc: kernel-janitors@vger.kernel.org,
Stephen Rothwell <sfr@canb.auug.org.au>,
Rupjyoti Sarmah <rsarmah@appliedmicro.com>,
Prodyut Hazarika <phazarika@appliedmicro.com>,
Grant Likely <grant.likely@secretlab.ca>,
linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ata: sata_dwc_460ex: fix error path
Date: Wed, 16 Feb 2011 21:10:46 +0300 [thread overview]
Message-ID: <4D5C1326.2010101@ru.mvista.com> (raw)
In-Reply-To: <1284317830-5022-1-git-send-email-segooon@gmail.com>
Hello.
Vasiliy Kulikov wrote:
> Free all allocated resources on error path.
> Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
> ---
> I cannot compile this driver at all, so it is not tested.
I can at least compile-test the patch...
> drivers/ata/sata_dwc_460ex.c | 21 ++++++++++++++-------
> 1 files changed, 14 insertions(+), 7 deletions(-)
> diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
> index 6cf57c5..ad0535f 100644
> --- a/drivers/ata/sata_dwc_460ex.c
> +++ b/drivers/ata/sata_dwc_460ex.c
> @@ -727,11 +727,15 @@ static int dma_dwc_xfer_setup(struct scatterlist *sg, int num_elems,
> static void dma_dwc_exit(struct sata_dwc_device *hsdev)
> {
> dev_dbg(host_pvt.dwc_dev, "%s:\n", __func__);
> - if (host_pvt.sata_dma_regs)
> + if (host_pvt.sata_dma_regs) {
> iounmap(host_pvt.sata_dma_regs);
> + host_pvt.sata_dma_regs = NULL;
> + }
>
> - if (hsdev->irq_dma)
> + if (hsdev->irq_dma) {
> free_irq(hsdev->irq_dma, hsdev);
> + hsdev->irq_dma = 0;
> + }
> }
Are those changes really necessary, i.e. is dma_dwc_exit() called more than
once?
> @@ -1606,7 +1610,7 @@ static int sata_dwc_probe(struct platform_device *ofdev,
> if (hsdev == NULL) {
> dev_err(&ofdev->dev, "kmalloc failed for hsdev\n");
> err = -ENOMEM;
> - goto error_out;
> + goto error;
Why not just:
return err;
> }
> memset(hsdev, 0, sizeof(*hsdev));
>
> @@ -1616,7 +1620,7 @@ static int sata_dwc_probe(struct platform_device *ofdev,
> dev_err(&ofdev->dev, "ioremap failed for SATA register"
> " address\n");
> err = -ENODEV;
> - goto error_out;
> + goto error_kmalloc;
> }
> hsdev->reg_base = base;
> dev_dbg(&ofdev->dev, "ioremap done for SATA register address\n");
> @@ -1629,7 +1633,7 @@ static int sata_dwc_probe(struct platform_device *ofdev,
> if (!host) {
> dev_err(&ofdev->dev, "ata_host_alloc_pinfo failed\n");
> err = -ENOMEM;
> - goto error_out;
> + goto error_iomap;
> }
>
> host->private_data = hsdev;
> @@ -1697,8 +1701,11 @@ error_out:
> /* Free SATA DMA resources */
> dma_dwc_exit(hsdev);
>
> - if (base)
> - iounmap(base);
> +error_iomap:
> + iounmap(base);
> +error_kmalloc:
> + kfree(hsdev);
> +error:
> return err;
> }
Jeff, what's become with this patch? Will you queue it? And will you queue
my 4 fixes (and 1 cleanup)?
WBR, Sergei
next prev parent reply other threads:[~2011-02-16 18:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-12 18:57 [PATCH] ata: sata_dwc_460ex: fix error path Vasiliy Kulikov
2011-02-16 18:10 ` Sergei Shtylyov [this message]
2011-02-18 17:27 ` Vasiliy Kulikov
2011-02-21 15:31 ` Sergei Shtylyov
2011-06-27 9:21 ` Sergei Shtylyov
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=4D5C1326.2010101@ru.mvista.com \
--to=sshtylyov@mvista.com \
--cc=grant.likely@secretlab.ca \
--cc=jgarzik@pobox.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=phazarika@appliedmicro.com \
--cc=rsarmah@appliedmicro.com \
--cc=segooon@gmail.com \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).