UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

pata_imx: cleanup error path 

- rename free_priv label to 'err' since priv is allocated with devm_*
  and not freed here.
- add missing 'goto err' in case ata_host_activate fails
- add 'ret' variable to return correct error value instead of hardcoded
  -ENOMEM in error case.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Sascha Hauer 2013-04-04 11:25:05 +02:00 committed by Jeff Garzik
parent 50f5a3415c
commit ff540d029a
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/ata/pata_imx.c
View File

@ -98,6 +98,7 @@ static int pata_imx_probe(struct platform_device *pdev)
struct pata_imx_priv *priv; struct pata_imx_priv *priv;
int irq = 0; int irq = 0;
struct resource *io_res; struct resource *io_res;
int ret;
io_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); io_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (io_res == NULL) if (io_res == NULL)
@ -121,8 +122,10 @@ static int pata_imx_probe(struct platform_device *pdev)
clk_prepare_enable(priv->clk); clk_prepare_enable(priv->clk);
host = ata_host_alloc(&pdev->dev, 1); host = ata_host_alloc(&pdev->dev, 1);
if (!host) if (!host) {
goto free_priv; ret = -ENOMEM;
goto err;
}
host->private_data = priv; host->private_data = priv;
ap = host->ports[0]; ap = host->ports[0];
@ -135,7 +138,8 @@ static int pata_imx_probe(struct platform_device *pdev)
resource_size(io_res)); resource_size(io_res));
if (!priv->host_regs) { if (!priv->host_regs) {
dev_err(&pdev->dev, "failed to map IO/CTL base\n"); dev_err(&pdev->dev, "failed to map IO/CTL base\n");
goto free_priv; ret = -EBUSY;
goto err;
} }
ap->ioaddr.cmd_addr = priv->host_regs + PATA_IMX_DRIVE_DATA; ap->ioaddr.cmd_addr = priv->host_regs + PATA_IMX_DRIVE_DATA;
@ -158,13 +162,17 @@ static int pata_imx_probe(struct platform_device *pdev)
priv->host_regs + PATA_IMX_ATA_INT_EN); priv->host_regs + PATA_IMX_ATA_INT_EN);
/* activate */ /* activate */
return ata_host_activate(host, irq, ata_sff_interrupt, 0, ret = ata_host_activate(host, irq, ata_sff_interrupt, 0,
&pata_imx_sht); &pata_imx_sht);
free_priv: if (ret)
goto err;
return 0;
err:
clk_disable_unprepare(priv->clk); clk_disable_unprepare(priv->clk);
return -ENOMEM; return ret;
} }
static int pata_imx_remove(struct platform_device *pdev) static int pata_imx_remove(struct platform_device *pdev)