[kernel] r12559 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Sat Jan 10 01:14:52 2009
New Revision: 12559

Log:
Fix error path in PCI probing of Cyclades driver (Closes: #429011)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/cyclades-fix-probe-error-path.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/13

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sat Jan 10 01:14:52 2009
@@ -25,7 +25,8 @@
   * Disable link tuning in rt2500usb driver. (Closes: #510607)
   * Fix regressions in eata driver (Closes: #506835)
   * Skip incompatible fbdev logos (Closes: #508173)
-  
+  * Fix error path in PCI probing of Cyclades driver (Closes: #429011)
+
   [ Martin Michlmayr ]
   * V4L/DVB: Fix initialization of URB list (Thomas Reitmayr) to address
     the oops reported at http://forum.qnap.com/viewtopic.php?f=147&t=10572
@@ -39,7 +40,7 @@
     - Add missing calls to plat_unmap_dma_mem.
     - Only write c0_framemask on CPUs which have this register.
 
- -- dann frazier <dannf at debian.org>  Fri, 09 Jan 2009 18:10:41 -0700
+ -- dann frazier <dannf at debian.org>  Fri, 09 Jan 2009 18:13:46 -0700
 
 linux-2.6 (2.6.26-12) unstable; urgency=high
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/cyclades-fix-probe-error-path.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/cyclades-fix-probe-error-path.patch	Sat Jan 10 01:14:52 2009
@@ -0,0 +1,28 @@
+commit c847d47cb7b2fa78b17c9e17ed3fbd010ee3d3ca
+Author: Andrew Morton <akpm at linux-foundation.org>
+Date:   Fri Jan 2 13:50:07 2009 +0000
+
+    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 at rfc822.org>
+    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+    Signed-off-by: Alan Cox <alan at redhat.com>
+    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
+index 5e5b1dc..6a59f72 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;

Modified: dists/sid/linux-2.6/debian/patches/series/13
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/13	(original)
+++ dists/sid/linux-2.6/debian/patches/series/13	Sat Jan 10 01:14:52 2009
@@ -22,3 +22,4 @@
 + bugfix/parisc/userspace-unwind-crash.patch
 + bugfix/enforce-minimum-SG_IO-timeout.patch
 + bugfix/all/fbdev-check-logo-compat.patch
++ bugfix/all/cyclades-fix-probe-error-path.patch