From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 2 Jan 2009 13:50:07 +0000 (+0000)
Subject: drivers/char/cyclades.c: cy_pci_probe: fix error path
X-Git-Tag: v2.6.29-rc1~545^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c847d47cb7b2fa78b17c9e17ed3fbd010ee3d3ca;p=linux-2.6-omap-h63xx.git

drivers/char/cyclades.c: cy_pci_probe: fix error path

We forgot to release resources in one case.

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=12137

Reported-by: Florian Lohoff <flo@rfc822.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 5e5b1dc1a0a..6a59f72a9c2 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -5010,7 +5010,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
 		if (nchan == 0) {
 			dev_err(&pdev->dev, "Cyclom-Y PCI host card with no "
 					"Serial-Modules\n");
-			return -EIO;
+			goto err_unmap;
 		}
 	} else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Hi) {
 		struct RUNTIME_9060 __iomem *ctl_addr;