Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (34 commits)
  PCI: Only build PCI syscalls on architectures that want them
  PCI: limit pci_get_bus_and_slot to domain 0
  PCI: hotplug: acpiphp: avoid acpiphp "cannot get bridge info" PCI hotplug failure
  PCI: hotplug: acpiphp: remove hot plug parameter write to PCI host bridge
  PCI: hotplug: acpiphp: fix slot poweroff problem on systems without _PS3
  PCI: hotplug: pciehp: wait for 1 second after power off slot
  PCI: pci_set_power_state(): check for PM capabilities earlier
  PCI: cpci_hotplug: Convert to use the kthread API
  PCI: add pci_try_set_mwi
  PCI: pcie: remove SPIN_LOCK_UNLOCKED
  PCI: ROUND_UP macro cleanup in drivers/pci
  PCI: remove pci_dac_dma_... APIs
  PCI: pci-x-pci-express-read-control-interfaces cleanups
  PCI: Fix typo in include/linux/pci.h
  PCI: pci_ids, remove double or more empty lines
  PCI: pci_ids, add atheros and 3com_2 vendors
  PCI: pci_ids, reorder some entries
  PCI: i386: traps, change VENDOR to DEVICE
  PCI: ATM: lanai, change VENDOR to DEVICE
  PCI: Change all drivers to use pci_device->revision
  ...

1 files changed, 11 insertions, 9 deletions

diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c
index 9d37fec27f24..2ac050d7f8cf 100644
--- a/drivers/pci/syscall.c
+++ b/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 @@ error:
         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;
 }