aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/sn/kernel/irq.c
diff options
context:
space:
mode:
authorPrarit Bhargava <prarit@sgi.com>2006-02-09 17:12:24 -0500
committerTony Luck <tony.luck@intel.com>2006-02-09 17:12:24 -0500
commit8b34ff427d6f3b0a1207829350b9db16376f88c5 (patch)
treea3f33ef514dc2da5aa098686acc00cfaf1eaa98b /arch/ia64/sn/kernel/irq.c
parent0bdd340c092b0936f78a54bdbd3927463ed4fca3 (diff)
[IA64-SGI] Hotplug driver related fix in the SN ia64 code.
Remove an erroneous kfree, and unlink the pcidev_info struct from the pcidev_info list prior to free'ing the pcidev_info struct. Signed-off-by: Prarit Bhargava <prarit@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/sn/kernel/irq.c')
-rw-r--r--arch/ia64/sn/kernel/irq.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 74d87d903d5d..c373113d073a 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -299,7 +299,9 @@ void sn_irq_unfixup(struct pci_dev *pci_dev)
299 return; 299 return;
300 300
301 sn_irq_info = SN_PCIDEV_INFO(pci_dev)->pdi_sn_irq_info; 301 sn_irq_info = SN_PCIDEV_INFO(pci_dev)->pdi_sn_irq_info;
302 if (!sn_irq_info || !sn_irq_info->irq_irq) { 302 if (!sn_irq_info)
303 return;
304 if (!sn_irq_info->irq_irq) {
303 kfree(sn_irq_info); 305 kfree(sn_irq_info);
304 return; 306 return;
305 } 307 }