diff options
| author | Matthias Kaehlcke | 2007-07-09 23:17:56 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2007-07-09 23:17:56 +0200 |
| commit | f9383c4269d264c3cf563bd2de365891f6592ebd (patch) | |
| tree | 7f1f3525c51237dc5806d17dd2c68c19d47a493b /drivers/ide/ide-disk.c | |
| parent | aec62xx: remove init_dma() method (take 2) (diff) | |
| download | kernel-qcow2-linux-f9383c4269d264c3cf563bd2de365891f6592ebd.tar.gz kernel-qcow2-linux-f9383c4269d264c3cf563bd2de365891f6592ebd.tar.xz kernel-qcow2-linux-f9383c4269d264c3cf563bd2de365891f6592ebd.zip | |
ide: use mutex instead of ide_setting_sem semaphore in IDE driver
The IDE driver uses a semaphore as mutex.
Use the mutex API instead of the (binary) semaphore.
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
--
Diffstat (limited to 'drivers/ide/ide-disk.c')
| -rw-r--r-- | drivers/ide/ide-disk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index dc2175c81f5e..b1304a7f3e0a 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c @@ -1190,11 +1190,11 @@ static int idedisk_ioctl(struct inode *inode, struct file *file, return generic_ide_ioctl(drive, file, bdev, cmd, arg); read_val: - down(&ide_setting_sem); + mutex_lock(&ide_setting_mtx); spin_lock_irqsave(&ide_lock, flags); err = *val; spin_unlock_irqrestore(&ide_lock, flags); - up(&ide_setting_sem); + mutex_unlock(&ide_setting_mtx); return err >= 0 ? put_user(err, (long __user *)arg) : err; set_val: @@ -1204,9 +1204,9 @@ set_val: if (!capable(CAP_SYS_ADMIN)) err = -EACCES; else { - down(&ide_setting_sem); + mutex_lock(&ide_setting_mtx); err = setfunc(drive, arg); - up(&ide_setting_sem); + mutex_unlock(&ide_setting_mtx); } } return err; |