Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / dvb / bt8xx / dst_ca.c

diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
index cf87051628458efd1035b172d22c40f3b3e00c8a..48e48e8af55a0584535804240d0ba7e1f26d1562 100644 (file)
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -22,7 +22,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/string.h>
 #include <linux/dvb/ca.h>
 #include "dvbdev.h"
@@ -52,6 +52,7 @@
 } while(0)
 
 
+static DEFINE_MUTEX(dst_ca_mutex);
 static unsigned int verbose = 5;
 module_param(verbose, int, 0644);
 MODULE_PARM_DESC(verbose, "verbose startup messages, default is 1 (yes)");
@@ -564,7 +565,7 @@ static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioct
        void __user *arg = (void __user *)ioctl_arg;
        int result = 0;
 
-       lock_kernel();
+       mutex_lock(&dst_ca_mutex);
        dvbdev = file->private_data;
        state = (struct dst_state *)dvbdev->priv;
        p_ca_message = kmalloc(sizeof (struct ca_msg), GFP_KERNEL);
@@ -652,7 +653,7 @@ static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioct
        kfree (p_ca_slot_info);
        kfree (p_ca_caps);
 
-       unlock_kernel();
+       mutex_unlock(&dst_ca_mutex);
        return result;
 }
 
@@ -694,7 +695,8 @@ static const struct file_operations dst_ca_fops = {
        .open = dst_ca_open,
        .release = dst_ca_release,
        .read = dst_ca_read,
-       .write = dst_ca_write
+       .write = dst_ca_write,
+       .llseek = noop_llseek,
 };
 
 static struct dvb_device dvbdev_ca = {