Commit 8b285ce8 authored Jun 27, 2008 by David Howells Committed by Jesse Barnes Jun 27, 2008

PCI: fix pci_setup_device()'s sprinting into a const buffer



Make pci_setup_device() write the bus ID directly into the allotted storage,
rather than using pci_name() as the address as that now returns a const
pointer.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

parent 9433f6dd

drivers/pci/probe.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -713,7 +713,8 @@ static int pci_setup_device(struct pci_dev * dev)
		{
		u32 class;

		sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
		snprintf(dev->dev.bus_id, BUS_ID_SIZE,
		"%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
		dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));

		pci_read_config_dword(dev, PCI_CLASS_REVISION, &class);

Admin message