The Virtual Video 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: Mauro Carvalho Chehab <mchehab@infradead.org>
#include <linux/pci.h>
#include <linux/random.h>
#include <linux/version.h>
#include <linux/pci.h>
#include <linux/random.h>
#include <linux/version.h>
+#include <linux/mutex.h>
#include <linux/videodev2.h>
#include <linux/dma-mapping.h>
#ifdef CONFIG_VIDEO_V4L1_COMPAT
#include <linux/videodev2.h>
#include <linux/dma-mapping.h>
#ifdef CONFIG_VIDEO_V4L1_COMPAT
struct vivi_dev {
struct list_head vivi_devlist;
struct vivi_dev {
struct list_head vivi_devlist;
static int res_get(struct vivi_dev *dev, struct vivi_fh *fh)
{
/* is it free? */
static int res_get(struct vivi_dev *dev, struct vivi_fh *fh)
{
/* is it free? */
+ mutex_lock(&dev->lock);
if (dev->resources) {
/* no, someone else uses it */
if (dev->resources) {
/* no, someone else uses it */
+ mutex_unlock(&dev->lock);
return 0;
}
/* it's free, grab it */
dev->resources =1;
dprintk(1,"res: get\n");
return 0;
}
/* it's free, grab it */
dev->resources =1;
dprintk(1,"res: get\n");
+ mutex_unlock(&dev->lock);
static void res_free(struct vivi_dev *dev, struct vivi_fh *fh)
{
static void res_free(struct vivi_dev *dev, struct vivi_fh *fh)
{
+ mutex_lock(&dev->lock);
dev->resources = 0;
dprintk(1,"res: put\n");
dev->resources = 0;
dprintk(1,"res: put\n");
+ mutex_lock(&dev->lock);
}
/* ------------------------------------------------------------------
}
/* ------------------------------------------------------------------
init_waitqueue_head(&dev->vidq.wq);
/* initialize locks */
init_waitqueue_head(&dev->vidq.wq);
/* initialize locks */
- init_MUTEX(&dev->lock);
+ mutex_init(&dev->lock);
dev->vidq.timeout.function = vivi_vid_timeout;
dev->vidq.timeout.data = (unsigned long)dev;
dev->vidq.timeout.function = vivi_vid_timeout;
dev->vidq.timeout.data = (unsigned long)dev;