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

[linux-3.10.git] / drivers / pci / proc.c

diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index d21894c63f8e01278916abf680446de0ac3748a4..92a8857608329f26892c990e6425be88020df5c3 100644 (file)
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -25,7 +25,7 @@ proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
        loff_t new = -1;
        struct inode *inode = file->f_dentry->d_inode;
 
        loff_t new = -1;
        struct inode *inode = file->f_dentry->d_inode;
 

-       down(&inode->i_sem);
+       mutex_lock(&inode->i_mutex);

        switch (whence) {
        case 0:
                new = off;
        switch (whence) {
        case 0:
                new = off;


@@ -41,7 +41,7 @@ proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
                new = -EINVAL;
        else
                file->f_pos = new;
                new = -EINVAL;
        else
                file->f_pos = new;

-       up(&inode->i_sem);
+       mutex_unlock(&inode->i_mutex);

        return new;
 }
 
        return new;
 }