---

yaml --- r: 262969 b: refs/heads/master c: 1ccd4b7 h: refs/heads/master i: 262967: 656a150 v: v3
git-mirror · Aug 13, 2011 · 2dd5077 · 2dd5077
1 parent f2f0b34
commit 2dd5077
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38ca285044be88a0fb47b6eb91deeeb729435fd0
+refs/heads/master: 1ccd4b7bfdcfcc8cc7ffc4a9c11d3ac5b6da8ca0
diff --git a/trunk/drivers/misc/cb710/core.c b/trunk/drivers/misc/cb710/core.c
@@ -33,7 +33,7 @@ EXPORT_SYMBOL_GPL(cb710_pci_update_config_reg);
 static int __devinit cb710_pci_configure(struct pci_dev *pdev)
 {
 	unsigned int devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
-	struct pci_dev *pdev0 = pci_get_slot(pdev->bus, devfn);
+	struct pci_dev *pdev0;
 	u32 val;
 
 	cb710_pci_update_config_reg(pdev, 0x48,
@@ -43,6 +43,7 @@ static int __devinit cb710_pci_configure(struct pci_dev *pdev)
 	if (val & 0x80000000)
 		return 0;
 
+	pdev0 = pci_get_slot(pdev->bus, devfn);
 	if (!pdev0)
 		return -ENODEV;