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

Commit 4725e7bd authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

PCI: fix up error messages for pci_bus registering 



Due to the class_device cleanup of pci_bus, the error messages when
things go wrong are incorrect.  So fix this up to properly report what
is really happening, if things go wrong.

Thanks to Kay for pointing out the issue.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0ab2b57f

drivers/pci/bus.c

+6 −4
Original line number Diff line number Diff line
@@ -145,13 +145,15 @@ void pci_bus_add_devices(struct pci_bus *bus) 
			child_bus = dev->subordinate;

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

			retval = device_register(&child_bus->dev);

			if (!retval)

			if (retval)

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

					" continuing...\n");

			else

				retval = device_create_file(&child_bus->dev,

							&dev_attr_cpuaffinity);

			if (retval)

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

					" device bridge symlink,"

					" continuing...\n");

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

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

		}

	}

}