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

Commit eebfcfb5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Jesse Barnes
Browse files

PCI: handle pci_name() being const 



This changes pci_setup_device to handle pci_name() now returning a
constant string.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 80be0385

drivers/pci/probe.c

+3 −3
Original line number Diff line number Diff line
@@ -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;