PCI: fix issue with busses registering multiple times in sysfs
PCI busses can be registered multiple times, so we need to detect if we have registered our bus structure in sysfs already. If so, don't do it again. Thanks to Guennadi Liakhovetski <g.liakhovetski@gmx.de> for reporting the problem, and to Linus for poking me to get me to believe that it was a real problem. Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
93d74463d0
commit
cc74d96f47
|
@ -143,14 +143,18 @@ void pci_bus_add_devices(struct pci_bus *bus)
|
||||||
/* register the bus with sysfs as the parent is now
|
/* register the bus with sysfs as the parent is now
|
||||||
* properly registered. */
|
* properly registered. */
|
||||||
child_bus = dev->subordinate;
|
child_bus = dev->subordinate;
|
||||||
|
if (child_bus->is_added)
|
||||||
|
continue;
|
||||||
child_bus->dev.parent = child_bus->bridge;
|
child_bus->dev.parent = child_bus->bridge;
|
||||||
retval = device_register(&child_bus->dev);
|
retval = device_register(&child_bus->dev);
|
||||||
if (retval)
|
if (retval)
|
||||||
dev_err(&dev->dev, "Error registering pci_bus,"
|
dev_err(&dev->dev, "Error registering pci_bus,"
|
||||||
" continuing...\n");
|
" continuing...\n");
|
||||||
else
|
else {
|
||||||
|
child_bus->is_added = 1;
|
||||||
retval = device_create_file(&child_bus->dev,
|
retval = device_create_file(&child_bus->dev,
|
||||||
&dev_attr_cpuaffinity);
|
&dev_attr_cpuaffinity);
|
||||||
|
}
|
||||||
if (retval)
|
if (retval)
|
||||||
dev_err(&dev->dev, "Error creating cpuaffinity"
|
dev_err(&dev->dev, "Error creating cpuaffinity"
|
||||||
" file, continuing...\n");
|
" file, continuing...\n");
|
||||||
|
|
|
@ -278,6 +278,7 @@ struct pci_bus {
|
||||||
struct device dev;
|
struct device dev;
|
||||||
struct bin_attribute *legacy_io; /* legacy I/O for this bus */
|
struct bin_attribute *legacy_io; /* legacy I/O for this bus */
|
||||||
struct bin_attribute *legacy_mem; /* legacy mem */
|
struct bin_attribute *legacy_mem; /* legacy mem */
|
||||||
|
unsigned int is_added:1;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define pci_bus_b(n) list_entry(n, struct pci_bus, node)
|
#define pci_bus_b(n) list_entry(n, struct pci_bus, node)
|
||||||
|
|
Loading…
Reference in a new issue