Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / pci / syscall.c

diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c
index 8b003c8..61a6fe3 100644 (file)
--- a/drivers/pci/syscall.c
+++ b/drivers/pci/syscall.c
@@ -19,11 +19,12 @@ SYSCALL_DEFINE5(pciconfig_read, unsigned long, bus, unsigned long, dfn,
        u8 byte;
        u16 word;
        u32 dword;
-       long err;
-       int cfg_ret;
+       int err, cfg_ret;
 
+       err = -EPERM;
+       dev = NULL;
        if (!capable(CAP_SYS_ADMIN))
-               return -EPERM;
+               goto error;
 
        err = -ENODEV;
        dev = pci_get_domain_bus_and_slot(0, bus, dfn);