X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fmedia%2Fvideo%2Fsaa5246a.c;h=2ce0102013083bdbd497addd96aa55cc3a28ab5b;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=dd830e0e5e96f112ff7b2181df9f771a5dfdf1b8;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index dd830e0e5..2ce010201 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -46,8 +46,6 @@
 #include <linux/i2c.h>
 #include <linux/videotext.h>
 #include <linux/videodev.h>
-#include <linux/mutex.h>
-
 #include "saa5246a.h"
 
 MODULE_AUTHOR("Michael Geng <linux@MichaelGeng.de>");
@@ -59,7 +57,7 @@ struct saa5246a_device
 	u8     pgbuf[NUM_DAUS][VTX_VIRTUALSIZE];
 	int    is_searching[NUM_DAUS];
 	struct i2c_client *client;
-	struct mutex lock;
+	struct semaphore lock;
 };
 
 static struct video_device saa_template;	/* Declared near bottom */
@@ -92,7 +90,7 @@ static int saa5246a_attach(struct i2c_adapter *adap, int addr, int kind)
 		return -ENOMEM;
 	}
 	strlcpy(client->name, IF_NAME, I2C_NAME_SIZE);
-	mutex_init(&t->lock);
+	init_MUTEX(&t->lock);
 
 	/*
 	 *	Now create a video4linux device
@@ -721,9 +719,9 @@ static int saa5246a_ioctl(struct inode *inode, struct file *file,
 	int err;
 
 	cmd = vtx_fix_command(cmd);
-	mutex_lock(&t->lock);
+	down(&t->lock);
 	err = video_usercopy(inode, file, cmd, arg, do_saa5246a_ioctl);
-	mutex_unlock(&t->lock);
+	up(&t->lock);
 	return err;
 }