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

Commit ebe168d5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: fix issue with busses registering multiple times in sysfs
parents b15a3891 cc74d96f

drivers/pci/bus.c

+5 −1
Original line number Diff line number Diff line
@@ -143,14 +143,18 @@ void pci_bus_add_devices(struct pci_bus *bus) 
			/* register the bus with sysfs as the parent is now

			 * properly registered. */

			child_bus = dev->subordinate;

			if (child_bus->is_added)

				continue;

			child_bus->dev.parent = child_bus->bridge;

			retval = device_register(&child_bus->dev);

			if (retval)

				dev_err(&dev->dev, "Error registering pci_bus,"

					" continuing...\n");

			else

			else {

				child_bus->is_added = 1;

				retval = device_create_file(&child_bus->dev,

							&dev_attr_cpuaffinity);

			}

			if (retval)

				dev_err(&dev->dev, "Error creating cpuaffinity"

					" file, continuing...\n");

include/linux/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ struct pci_bus { 
	struct device		dev;

	struct bin_attribute	*legacy_io; /* legacy I/O for this bus */

	struct bin_attribute	*legacy_mem; /* legacy mem */

	unsigned int		is_added:1;

};



#define pci_bus_b(n)	list_entry(n, struct pci_bus, node)