1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index 06b696e9acbd..54f8b95717b0 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -33,7 +33,7 @@
 #include <linux/device.h>
 #include <linux/fs.h>
 #include <linux/cdev.h>
-
+#include <linux/mutex.h>
 #include "dvbdev.h"
 
 static int dvbdev_debug;
@@ -44,7 +44,7 @@ MODULE_PARM_DESC(dvbdev_debug, "Turn on/off device debugging (default:off).");
 #define dprintk if (dvbdev_debug) printk
 
 static LIST_HEAD(dvb_adapter_list);
-static DECLARE_MUTEX(dvbdev_register_lock);
+static DEFINE_MUTEX(dvbdev_register_lock);
 
 static const char * const dnames[] = {
         "video", "audio", "sec", "frontend", "demux", "dvr", "ca",
@@ -202,11 +202,11 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
         struct dvb_device *dvbdev;
         int id;
 
-        if (down_interruptible (&dvbdev_register_lock))
+        if (mutex_lock_interruptible(&dvbdev_register_lock))
                 return -ERESTARTSYS;
 
         if ((id = dvbdev_get_free_id (adap, type)) < 0) {
-                up (&dvbdev_register_lock);
+                mutex_unlock(&dvbdev_register_lock);
                 *pdvbdev = NULL;
                 printk ("%s: could get find free device id...\n", __FUNCTION__);
                 return -ENFILE;
@@ -215,11 +215,11 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
         *pdvbdev = dvbdev = kmalloc(sizeof(struct dvb_device), GFP_KERNEL);
 
         if (!dvbdev) {
-                up(&dvbdev_register_lock);
+                mutex_unlock(&dvbdev_register_lock);
                 return -ENOMEM;
         }
 
-        up (&dvbdev_register_lock);
+        mutex_unlock(&dvbdev_register_lock);
 
         memcpy(dvbdev, template, sizeof(struct dvb_device));
         dvbdev->type = type;
@@ -289,11 +289,11 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct modu
 {
         int num;
 
-        if (down_interruptible (&dvbdev_register_lock))
+        if (mutex_lock_interruptible(&dvbdev_register_lock))
                 return -ERESTARTSYS;
 
         if ((num = dvbdev_get_free_adapter_num ()) < 0) {
-                up (&dvbdev_register_lock);
+                mutex_unlock(&dvbdev_register_lock);
                 return -ENFILE;
         }
 
@@ -309,7 +309,7 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct modu
 
         list_add_tail (&adap->list_head, &dvb_adapter_list);
 
-        up (&dvbdev_register_lock);
+        mutex_unlock(&dvbdev_register_lock);
 
         return num;
 }
@@ -320,10 +320,10 @@ int dvb_unregister_adapter(struct dvb_adapter *adap)
 {
         devfs_remove("dvb/adapter%d", adap->num);
 
-        if (down_interruptible (&dvbdev_register_lock))
+        if (mutex_lock_interruptible(&dvbdev_register_lock))
                 return -ERESTARTSYS;
         list_del (&adap->list_head);
-        up (&dvbdev_register_lock);
+        mutex_unlock(&dvbdev_register_lock);
         return 0;
 }
 EXPORT_SYMBOL(dvb_unregister_adapter);