diff options
| author | Julia Lawall <julia@diku.dk> | 2011-08-10 10:47:16 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-10-24 14:09:10 +0200 |
| commit | 981c65a9b3e24029f64bd45c7a92f901899a033e (patch) | |
| tree | d7e7c088ef1fdeca6ba8f53bef3fd4fc6c6555a2 /drivers/mfd | |
| parent | 54d8e2c323b439e0e20ea44d17b875d9a43f7d66 (diff) | |
| download | linux-3.10-981c65a9b3e24029f64bd45c7a92f901899a033e.tar.gz linux-3.10-981c65a9b3e24029f64bd45c7a92f901899a033e.tar.bz2 linux-3.10-981c65a9b3e24029f64bd45c7a92f901899a033e.zip | |
mfd: Clean timberdale error handling code up
In the first three cases, ioremap has been called, so iounmap is needed. A
new label for this is introduced, to differentiate it from err_msix, which
is the first point at which msix_entries actually needs to be freed.
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/timberdale.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c index 696879e2eef..02d65692ceb 100644 --- a/drivers/mfd/timberdale.c +++ b/drivers/mfd/timberdale.c @@ -697,7 +697,7 @@ static int __devinit timb_probe(struct pci_dev *dev, dev_err(&dev->dev, "The driver supports an older " "version of the FPGA, please update the driver to " "support %d.%d\n", priv->fw.major, priv->fw.minor); - goto err_ioremap; + goto err_config; } if (priv->fw.major < TIMB_SUPPORTED_MAJOR || priv->fw.minor < TIMB_REQUIRED_MINOR) { @@ -705,13 +705,13 @@ static int __devinit timb_probe(struct pci_dev *dev, "please upgrade the FPGA to at least: %d.%d\n", priv->fw.major, priv->fw.minor, TIMB_SUPPORTED_MAJOR, TIMB_REQUIRED_MINOR); - goto err_ioremap; + goto err_config; } msix_entries = kzalloc(TIMBERDALE_NR_IRQS * sizeof(*msix_entries), GFP_KERNEL); if (!msix_entries) - goto err_ioremap; + goto err_config; for (i = 0; i < TIMBERDALE_NR_IRQS; i++) msix_entries[i].entry = i; @@ -825,6 +825,8 @@ err_mfd: err_create_file: pci_disable_msix(dev); err_msix: + kfree(msix_entries); +err_config: iounmap(priv->ctl_membase); err_ioremap: release_mem_region(priv->ctl_mapbase, CHIPCTLSIZE); @@ -833,7 +835,6 @@ err_request: err_start: pci_disable_device(dev); err_enable: - kfree(msix_entries); kfree(priv); pci_set_drvdata(dev, NULL); return -ENODEV; |