diff options
| author | David Howells <dhowells@redhat.com> | 2008-06-27 13:23:20 +0100 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-06-27 13:09:02 -0700 |
| commit | 8b285ce84bbc719e363a796f466404576b840d36 (patch) | |
| tree | 05fb0faca73afc594f9dca60f4b2be742b0d60ae /drivers/pci | |
| parent | 9433f6dd3a4677e9b92c6e1cd7f98b11598b7c2c (diff) | |
| download | kernel_samsung_crespo-8b285ce84bbc719e363a796f466404576b840d36.zip kernel_samsung_crespo-8b285ce84bbc719e363a796f466404576b840d36.tar.gz kernel_samsung_crespo-8b285ce84bbc719e363a796f466404576b840d36.tar.bz2 | |
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>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/probe.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index f829119..0420fd8 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -713,8 +713,9 @@ static int pci_setup_device(struct pci_dev * dev) { u32 class; - sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus), - dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)); + 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); dev->revision = class & 0xff; |