From: gregkh@suse.de <gregkh@suse.de>
Date: Wed, 9 Mar 2005 19:50:05 +0000 (-0800)
Subject: [PATCH] add pciehp patch that is in -bk already.
X-Git-Tag: v2.6.11.9~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=812ae2e4393b0a170fe1067920af85a22990fd1f;p=thirdparty%2Fkernel%2Fstable-queue.git

[PATCH] add pciehp patch that is in -bk already.
---

diff --git a/pciehp.patch b/pciehp.patch
new file mode 100644
index 00000000000..0e360879d22
--- /dev/null
+++ b/pciehp.patch
@@ -0,0 +1,37 @@
+From owner-linux-pci@atrey.karlin.mff.cuni.cz Fri Mar  4 12:58:15 2005
+From: alexn@dsv.su.se
+Subject: [PATCH] PCI: fix hotplug double free
+Date: Fri, 4 Mar 2005 12:53:58 -0800
+To: linux-kernel@vger.kernel.org, linux-pci@atrey.karlin.mff.cuni.cz
+Status: RO
+Content-Length: 863
+Lines: 27
+
+[PATCH] PCI: fix hotplug double free
+
+With the brackets missed out func could be freed twice.
+
+Found by Coverity tool
+
+Signed-off-by: Alexander Nyberg <alexn@dsv.su.se>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+
+diff -Nru a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
+--- a/drivers/pci/hotplug/pciehp_ctrl.c	2005-03-04 12:41:13 -08:00
++++ b/drivers/pci/hotplug/pciehp_ctrl.c	2005-03-04 12:41:13 -08:00
+@@ -1354,10 +1354,11 @@
+ 				dbg("PCI Bridge Hot-Remove s:b:d:f(%02x:%02x:%02x:%02x)\n", 
+ 					ctrl->seg, func->bus, func->device, func->function);
+ 				bridge_slot_remove(func);
+-			} else
++			} else {
+ 				dbg("PCI Function Hot-Remove s:b:d:f(%02x:%02x:%02x:%02x)\n", 
+ 					ctrl->seg, func->bus, func->device, func->function);
+ 				slot_remove(func);
++			}
+ 
+ 			func = pciehp_slot_find(ctrl->slot_bus, device, 0);
+ 		}
+