Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b34ff42 authored by Prarit Bhargava's avatar Prarit Bhargava Committed by Tony Luck
Browse files

[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: default avatarPrarit Bhargava <prarit@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 0bdd340c

arch/ia64/sn/kernel/io_init.c

+2 −0
Original line number Diff line number Diff line
@@ -623,6 +623,8 @@ void sn_bus_free_sysdata(void) 
	list_for_each(list, &sn_sysdata_list) {

		element = list_entry(list, struct sysdata_el, entry);

		list_del(&element->entry);

		list_del(&(((struct pcidev_info *)

			     (element->sysdata))->pdi_list));

		kfree(element->sysdata);

		kfree(element);

		goto sn_sysdata_free_start;

arch/ia64/sn/kernel/irq.c

+3 −1
Original line number Diff line number Diff line
@@ -299,7 +299,9 @@ 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)

		return;

	if (!sn_irq_info->irq_irq) {

		kfree(sn_irq_info);

		return;

	}