Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3561ea9 authored May 08, 2007 by Jean Delvare Committed by Linus Torvalds May 08, 2007

Clean up mutex_trylock noise



Ingo Molnar's semaphore to mutex conversions left some noise on a few
trylock calls. Clean it up.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 97f06784

drivers/media/video/zoran_driver.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/mtd/mtd_blkdevs.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -216,7 +216,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
		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_blktrans_dev *new)

		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();
		}