[IA64] hotplug/ia64: SN Hotplug Driver - SN Hotplug Driver code

This patch is the SGI hotplug driver and additional changes required for
the driver.  These modifications include changes to the SN io_init.c code
for memory management, the inclusion of new SAL calls to enable and disable
PCI slots, and a hotplug-style driver.

Signed-off-by: Prarit Bhargava <prarit@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index cf4dbf9645f1..84d276a14ecb 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -284,7 +284,6 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info)
         int cpu = nasid_slice_to_cpuid(nasid, slice);
 
         pci_dev_get(pci_dev);
-
         sn_irq_info->irq_cpuid = cpu;
         sn_irq_info->irq_pciioinfo = SN_PCIDEV_INFO(pci_dev);
 
@@ -305,15 +304,16 @@ void sn_irq_unfixup(struct pci_dev *pci_dev)
                 return;
 
         sn_irq_info = SN_PCIDEV_INFO(pci_dev)->pdi_sn_irq_info;
-        if (!sn_irq_info || !sn_irq_info->irq_irq)
+        if (!sn_irq_info || !sn_irq_info->irq_irq) {
+                kfree(sn_irq_info);
                 return;
+        }
 
         unregister_intr_pda(sn_irq_info);
         spin_lock(&sn_irq_info_lock);
         list_del_rcu(&sn_irq_info->list);
         spin_unlock(&sn_irq_info_lock);
         call_rcu(&sn_irq_info->rcu, sn_irq_info_free);
-
         pci_dev_put(pci_dev);
 }