diff options
| author | Linus Torvalds | 2006-01-10 02:31:38 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-01-10 02:31:38 +0100 |
| commit | 80c0531514516e43ae118ddf38424e06e5c3cb3c (patch) | |
| tree | 2eef8cf8fdf505b18f83078d1eb41167e98f5b54 /drivers/pci/proc.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial (diff) | |
| parent | [PATCH] mutex subsystem, semaphore to completion: drivers/block/loop.c (diff) | |
| download | kernel-qcow2-linux-80c0531514516e43ae118ddf38424e06e5c3cb3c.tar.gz kernel-qcow2-linux-80c0531514516e43ae118ddf38424e06e5c3cb3c.tar.xz kernel-qcow2-linux-80c0531514516e43ae118ddf38424e06e5c3cb3c.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6
Diffstat (limited to 'drivers/pci/proc.c')
| -rw-r--r-- | drivers/pci/proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 9eb465727fce..9cb6dd0834be 100644 --- 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; - down(&inode->i_sem); + mutex_lock(&inode->i_mutex); 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; - up(&inode->i_sem); + mutex_unlock(&inode->i_mutex); return new; } |