From: Jean Delvare Ingo Molnar's semaphore to mutex conversions left some noise on a few trylock calls. Clean it up. Signed-off-by: Jean Delvare Acked-by: Ingo Molnar Cc: David Woodhouse Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton --- drivers/media/video/zoran_driver.c | 2 +- drivers/mtd/mtd_blkdevs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/media/video/zoran_driver.c~clean-up-mutex_trylock-noise drivers/media/video/zoran_driver.c --- a/drivers/media/video/zoran_driver.c~clean-up-mutex_trylock-noise +++ a/drivers/media/video/zoran_driver.c @@ -2034,7 +2034,7 @@ zoran_do_ioctl (struct inode *inode, * but moving the free code outside the munmap() handler fixes * all this... If someone knows why, please explain me (Ronald) */ - if (!!mutex_trylock(&zr->resource_lock)) { + if (mutex_trylock(&zr->resource_lock)) { /* we obtained it! Let's try to free some things */ if (fh->jpg_buffers.ready_to_be_freed) jpg_fbuffer_free(file); diff -puN drivers/mtd/mtd_blkdevs.c~clean-up-mutex_trylock-noise drivers/mtd/mtd_blkdevs.c --- a/drivers/mtd/mtd_blkdevs.c~clean-up-mutex_trylock-noise +++ a/drivers/mtd/mtd_blkdevs.c @@ -216,7 +216,7 @@ int add_mtd_blktrans_dev(struct mtd_blkt int last_devnum = -1; struct gendisk *gd; - if (!!mutex_trylock(&mtd_table_mutex)) { + if (mutex_trylock(&mtd_table_mutex)) { mutex_unlock(&mtd_table_mutex); BUG(); } @@ -294,7 +294,7 @@ int add_mtd_blktrans_dev(struct mtd_blkt int del_mtd_blktrans_dev(struct mtd_blktrans_dev *old) { - if (!!mutex_trylock(&mtd_table_mutex)) { + if (mutex_trylock(&mtd_table_mutex)) { mutex_unlock(&mtd_table_mutex); BUG(); } _