From 0a1b96e3fc1e1f850aa8245b2a7602248e40f1b9 Mon Sep 17 00:00:00 2001 From: David Howells Date: Fri, 27 Jun 2008 13:23:20 +0100 Subject: [PATCH] --- yaml --- r: 102273 b: refs/heads/master c: 8b285ce84bbc719e363a796f466404576b840d36 h: refs/heads/master i: 102271: 2a3b20fe38f37359b4d29ccfc2b979bae4fc0620 v: v3 --- [refs] | 2 +- trunk/drivers/pci/probe.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cfd3dea77ab9..a33c6e4d73dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9433f6dd3a4677e9b92c6e1cd7f98b11598b7c2c +refs/heads/master: 8b285ce84bbc719e363a796f466404576b840d36 diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c index f8291191ef91..0420fd8027b6 100644 --- a/trunk/drivers/pci/probe.c +++ b/trunk/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;