From eddd791d7265b6197e31c2af44b02a73aa50003f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 2 Jul 2008 13:24:49 -0700 Subject: [PATCH] --- yaml --- r: 102276 b: refs/heads/master c: eebfcfb52ce753eaaa8525078bda6b539586066c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/probe.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 92540b32f8e2..cc7daa061b6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80be038593dba7aa46fb24a14f0ba83e5ade0edb +refs/heads/master: eebfcfb52ce753eaaa8525078bda6b539586066c diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c index 0420fd8027b6..2f0ae70710d6 100644 --- a/trunk/drivers/pci/probe.c +++ b/trunk/drivers/pci/probe.c @@ -713,9 +713,9 @@ static int pci_setup_device(struct pci_dev * dev) { u32 class; - 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)); + dev_set_name(&dev->dev, "%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;