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

Commit 5ef68e88 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Bjorn Helgaas
Browse files

pcmcia: Use global PCI rescan-remove locking 



Multiple race conditions are possible between the cardbus PCI device
addition and removal and the generic PCI bus rescan and device removal that
can be triggered via sysfs.

To avoid those race conditions make the cardbus code use global PCI
rescan-remove locking.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 9217a984

drivers/pcmcia/cardbus.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,8 @@ int __ref cb_alloc(struct pcmcia_socket *s) 
	struct pci_dev *dev;

	struct pci_dev *dev;

	unsigned int max, pass;

	unsigned int max, pass;





	pci_lock_rescan_remove();



	s->functions = pci_scan_slot(bus, PCI_DEVFN(0, 0));

	s->functions = pci_scan_slot(bus, PCI_DEVFN(0, 0));

	pci_fixup_cardbus(bus);

	pci_fixup_cardbus(bus);
@@ -93,6 +95,7 @@ int __ref cb_alloc(struct pcmcia_socket *s) 




	pci_bus_add_devices(bus);

	pci_bus_add_devices(bus);





	pci_unlock_rescan_remove();

	return 0;

	return 0;

}

}
@@ -115,6 +118,10 @@ void cb_free(struct pcmcia_socket *s) 
	if (!bus)

	if (!bus)

		return;

		return;





	pci_lock_rescan_remove();



	list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list)

	list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list)

		pci_stop_and_remove_bus_device(dev);

		pci_stop_and_remove_bus_device(dev);



	pci_unlock_rescan_remove();

}
 
}