From 41113223cd0ecf3f3a5846ca645aa47a2b73c825 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Mon, 23 Apr 2007 14:57:37 +0100
Subject: [PATCH] --- yaml --- r: 59154 b: refs/heads/master c:
 e4585da22ad04a055cbb5c863a37aa8cc02eac89 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/pci/syscall.c | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index a23cccf246c3..d9ea93e94347 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a23adb5b2db7f2a0758abfa20b0220dbcbfd7aa9
+refs/heads/master: e4585da22ad04a055cbb5c863a37aa8cc02eac89
diff --git a/trunk/drivers/pci/syscall.c b/trunk/drivers/pci/syscall.c
index 9d37fec27f24..2ac050d7f8cf 100644
--- a/trunk/drivers/pci/syscall.c
+++ b/trunk/drivers/pci/syscall.c
@@ -23,14 +23,14 @@ sys_pciconfig_read(unsigned long bus, unsigned long dfn,
 	u8 byte;
 	u16 word;
 	u32 dword;
-	long err, cfg_ret;
+	long err;
+	long cfg_ret;
 
-	err = -EPERM;
 	if (!capable(CAP_SYS_ADMIN))
-		goto error;
+		return -EPERM;
 
 	err = -ENODEV;
-	dev = pci_find_slot(bus, dfn);
+	dev = pci_get_bus_and_slot(bus, dfn);
 	if (!dev)
 		goto error;
 
@@ -66,7 +66,8 @@ sys_pciconfig_read(unsigned long bus, unsigned long dfn,
 	case 4:
 		err = put_user(dword, (unsigned int __user *)buf);
 		break;
-	};
+	}
+	pci_dev_put(dev);
 	return err;
 
 error:
@@ -83,7 +84,8 @@ sys_pciconfig_read(unsigned long bus, unsigned long dfn,
 	case 4:
 		put_user(-1, (unsigned int __user *)buf);
 		break;
-	};
+	}
+	pci_dev_put(dev);
 	return err;
 }
 
@@ -101,7 +103,7 @@ sys_pciconfig_write(unsigned long bus, unsigned long dfn,
 	if (!capable(CAP_SYS_ADMIN))
 		return -EPERM;
 
-	dev = pci_find_slot(bus, dfn);
+	dev = pci_get_bus_and_slot(bus, dfn);
 	if (!dev)
 		return -ENODEV;
 
@@ -137,8 +139,8 @@ sys_pciconfig_write(unsigned long bus, unsigned long dfn,
 	default:
 		err = -EINVAL;
 		break;
-	};
+	}
 	unlock_kernel();
-
+	pci_dev_put(dev);
 	return err;
 }