1 files changed, 15 insertions, 15 deletions

diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index 7ebac7949df3..6b42713d97f4 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -378,20 +378,20 @@ static int s_fmt(struct saa7146_fh *fh, struct v4l2_format *f)
                 err = try_win(dev,&f->fmt.win);
                 if (0 != err)
                         return err;
-                down(&dev->lock);
+                mutex_lock(&dev->lock);
                 fh->ov.win    = f->fmt.win;
                 fh->ov.nclips = f->fmt.win.clipcount;
                 if (fh->ov.nclips > 16)
                         fh->ov.nclips = 16;
                 if (copy_from_user(fh->ov.clips,f->fmt.win.clips,sizeof(struct v4l2_clip)*fh->ov.nclips)) {
-                        up(&dev->lock);
+                        mutex_unlock(&dev->lock);
                         return -EFAULT;
                 }
 
                 /* fh->ov.fh is used to indicate that we have valid overlay informations, too */
                 fh->ov.fh = fh;
 
-                up(&dev->lock);
+                mutex_unlock(&dev->lock);
 
                 /* check if our current overlay is active */
                 if (IS_OVERLAY_ACTIVE(fh) != 0) {
@@ -516,7 +516,7 @@ static int set_control(struct saa7146_fh *fh, struct v4l2_control *c)
                 return -EINVAL;
         }
 
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
 
         switch (ctrl->type) {
         case V4L2_CTRL_TYPE_BOOLEAN:
@@ -560,7 +560,7 @@ static int set_control(struct saa7146_fh *fh, struct v4l2_control *c)
                 /* fixme: we can support changing VFLIP and HFLIP here... */
                 if (IS_CAPTURE_ACTIVE(fh) != 0) {
                         DEB_D(("V4L2_CID_HFLIP while active capture.\n"));
-                        up(&dev->lock);
+                        mutex_unlock(&dev->lock);
                         return -EINVAL;
                 }
                 vv->hflip = c->value;
@@ -568,7 +568,7 @@ static int set_control(struct saa7146_fh *fh, struct v4l2_control *c)
         case V4L2_CID_VFLIP:
                 if (IS_CAPTURE_ACTIVE(fh) != 0) {
                         DEB_D(("V4L2_CID_VFLIP while active capture.\n"));
-                        up(&dev->lock);
+                        mutex_unlock(&dev->lock);
                         return -EINVAL;
                 }
                 vv->vflip = c->value;
@@ -577,7 +577,7 @@ static int set_control(struct saa7146_fh *fh, struct v4l2_control *c)
                 return -EINVAL;
         }
         }
-        up(&dev->lock);
+        mutex_unlock(&dev->lock);
 
         if (IS_OVERLAY_ACTIVE(fh) != 0) {
                 saa7146_stop_preview(fh);
@@ -939,7 +939,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
                         }
                 }
 
-                down(&dev->lock);
+                mutex_lock(&dev->lock);
 
                 /* ok, accept it */
                 vv->ov_fb = *fb;
@@ -948,7 +948,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
                         vv->ov_fb.fmt.bytesperline =
                                 vv->ov_fb.fmt.width*fmt->depth/8;
 
-                up(&dev->lock);
+                mutex_unlock(&dev->lock);
 
                 return 0;
         }
@@ -1086,7 +1086,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
                         }
                 }
 
-                down(&dev->lock);
+                mutex_lock(&dev->lock);
 
                 for(i = 0; i < dev->ext_vv_data->num_stds; i++)
                         if (*id & dev->ext_vv_data->stds[i].id)
@@ -1098,7 +1098,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
                         found = 1;
                 }
 
-                up(&dev->lock);
+                mutex_unlock(&dev->lock);
 
                 if (vv->ov_suspend != NULL) {
                         saa7146_start_preview(vv->ov_suspend);
@@ -1201,11 +1201,11 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
                 DEB_D(("VIDIOCGMBUF \n"));
 
                 q = &fh->video_q;
-                down(&q->lock);
+                mutex_lock(&q->lock);
                 err = videobuf_mmap_setup(q,gbuffers,gbufsize,
                                           V4L2_MEMORY_MMAP);
                 if (err < 0) {
-                        up(&q->lock);
+                        mutex_unlock(&q->lock);
                         return err;
                 }
                 memset(mbuf,0,sizeof(*mbuf));
@@ -1213,7 +1213,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
                 mbuf->size   = gbuffers * gbufsize;
                 for (i = 0; i < gbuffers; i++)
                         mbuf->offsets[i] = i * gbufsize;
-                up(&q->lock);
+                mutex_unlock(&q->lock);
                 return 0;
         }
         default:
@@ -1414,7 +1414,7 @@ static int video_open(struct saa7146_dev *dev, struct file *file)
                             sizeof(struct saa7146_buf),
                             file);
 
-        init_MUTEX(&fh->video_q.lock);
+        mutex_init(&fh->video_q.lock);
 
         return 0;
 }