diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-02-27 03:50:11 +0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-02-27 03:50:11 +0400 |
| commit | f851013cb2238a82782da03ac82a14447933f90d (patch) | |
| tree | f97835f69d244865c4a5397d0e6d45d1276a919d /drivers/atm/solos-pci.c | |
| parent | f2699491e06584a2ebb0939f108ad29f3b151456 (diff) | |
| parent | 203738e548cefc3fc3c2f73a9063176c9f3583d5 (diff) | |
| download | linux-f851013cb2238a82782da03ac82a14447933f90d.tar.xz | |
Merge remote-tracking branch 'origin/master' into next
Diffstat (limited to 'drivers/atm/solos-pci.c')
| -rw-r--r-- | drivers/atm/solos-pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c index 5d1d07645132..e8cd652d2017 100644 --- a/drivers/atm/solos-pci.c +++ b/drivers/atm/solos-pci.c @@ -1206,9 +1206,9 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id) out_unmap_both: pci_set_drvdata(dev, NULL); - pci_iounmap(dev, card->config_regs); - out_unmap_config: pci_iounmap(dev, card->buffers); + out_unmap_config: + pci_iounmap(dev, card->config_regs); out_release_regions: pci_release_regions(dev); out: |