PCI: Lock upstream bridge for pci_reset_function()

[sfrench/cifs-2.6.git] / drivers / pci / probe.c

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 1325fbae2f28fb10dbbbd6c6ff65ce2cf9193f3d..a3da776bf98622de15eb29cc73a9cba046170607 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2543,6 +2543,9 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
        dev->dev.dma_mask = &dev->dma_mask;
        dev->dev.dma_parms = &dev->dma_parms;
        dev->dev.coherent_dma_mask = 0xffffffffull;
+       lockdep_register_key(&dev->cfg_access_key);
+       lockdep_init_map(&dev->cfg_access_lock, dev_name(&dev->dev),
+                        &dev->cfg_access_key, 0);
 
        dma_set_max_seg_size(&dev->dev, 65536);
        dma_set_seg_boundary(&dev->dev, 0xffffffff);