1 files changed, 11 insertions, 13 deletions

diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index f8cf73ed49ad..3870fa948cc0 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -17,18 +17,18 @@ int saa7146_res_get(struct saa7146_fh *fh, unsigned int bit)
         }
 
         /* is it free? */
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
         if (vv->resources & bit) {
                 DEB_D(("locked! vv->resources:0x%02x, we want:0x%02x\n",vv->resources,bit));
                 /* no, someone else uses it */
-                up(&dev->lock);
+                mutex_unlock(&dev->lock);
                 return 0;
         }
         /* it's free, grab it */
         fh->resources  |= bit;
         vv->resources |= bit;
         DEB_D(("res: get 0x%02x, cur:0x%02x\n",bit,vv->resources));
-        up(&dev->lock);
+        mutex_unlock(&dev->lock);
         return 1;
 }
 
@@ -37,14 +37,13 @@ void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits)
         struct saa7146_dev *dev = fh->dev;
         struct saa7146_vv *vv = dev->vv_data;
 
-        if ((fh->resources & bits) != bits)
-                BUG();
+        BUG_ON((fh->resources & bits) != bits);
 
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
         fh->resources  &= ~bits;
         vv->resources &= ~bits;
         DEB_D(("res: put 0x%02x, cur:0x%02x\n",bits,vv->resources));
-        up(&dev->lock);
+        mutex_unlock(&dev->lock);
 }
 
 
@@ -55,8 +54,7 @@ void saa7146_dma_free(struct saa7146_dev *dev,struct saa7146_buf *buf)
 {
         DEB_EE(("dev:%p, buf:%p\n",dev,buf));
 
-        if (in_interrupt())
-                BUG();
+        BUG_ON(in_interrupt());
 
         videobuf_waiton(&buf->vb,0,0);
         videobuf_dma_pci_unmap(dev->pci, &buf->vb.dma);
@@ -204,7 +202,7 @@ static int fops_open(struct inode *inode, struct file *file)
 
         DEB_EE(("inode:%p, file:%p, minor:%d\n",inode,file,minor));
 
-        if (down_interruptible(&saa7146_devices_lock))
+        if (mutex_lock_interruptible(&saa7146_devices_lock))
                 return -ERESTARTSYS;
 
         list_for_each(list,&saa7146_devices) {
@@ -276,7 +274,7 @@ out:
                 kfree(fh);
                 file->private_data = NULL;
         }
-        up(&saa7146_devices_lock);
+        mutex_unlock(&saa7146_devices_lock);
         return result;
 }
 
@@ -287,7 +285,7 @@ static int fops_release(struct inode *inode, struct file *file)
 
         DEB_EE(("inode:%p, file:%p\n",inode,file));
 
-        if (down_interruptible(&saa7146_devices_lock))
+        if (mutex_lock_interruptible(&saa7146_devices_lock))
                 return -ERESTARTSYS;
 
         if( fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
@@ -303,7 +301,7 @@ static int fops_release(struct inode *inode, struct file *file)
         file->private_data = NULL;
         kfree(fh);
 
-        up(&saa7146_devices_lock);
+        mutex_unlock(&saa7146_devices_lock);
 
         return 0;
 }