aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/dvb-core/dvbdev.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index 8b56d929f7fd..e208a60c048a 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -32,6 +32,7 @@
32#include <linux/fs.h> 32#include <linux/fs.h>
33#include <linux/cdev.h> 33#include <linux/cdev.h>
34#include <linux/mutex.h> 34#include <linux/mutex.h>
35#include <linux/smp_lock.h>
35#include "dvbdev.h" 36#include "dvbdev.h"
36 37
37static int dvbdev_debug; 38static int dvbdev_debug;
@@ -74,6 +75,7 @@ static int dvb_device_open(struct inode *inode, struct file *file)
74{ 75{
75 struct dvb_device *dvbdev; 76 struct dvb_device *dvbdev;
76 77
78 lock_kernel();
77 dvbdev = dvbdev_find_device (iminor(inode)); 79 dvbdev = dvbdev_find_device (iminor(inode));
78 80
79 if (dvbdev && dvbdev->fops) { 81 if (dvbdev && dvbdev->fops) {
@@ -90,8 +92,10 @@ static int dvb_device_open(struct inode *inode, struct file *file)
90 file->f_op = fops_get(old_fops); 92 file->f_op = fops_get(old_fops);
91 } 93 }
92 fops_put(old_fops); 94 fops_put(old_fops);
95 unlock_kernel();
93 return err; 96 return err;
94 } 97 }
98 unlock_kernel();
95 return -ENODEV; 99 return -ENODEV;
96} 100}
97 101