2 files changed, 10 insertions, 1 deletions

diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index c0c5d7509c25..6f423d116fb4 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -79,9 +79,11 @@ static int ts_open(struct inode *inode, struct file *file)
         struct saa7134_dev *dev;
         int err;
 
+        lock_kernel();
         list_for_each_entry(dev, &saa7134_devlist, devlist)
                 if (dev->empress_dev && dev->empress_dev->minor == minor)
                         goto found;
+        unlock_kernel();
         return -ENODEV;
  found:
 
@@ -103,6 +105,7 @@ static int ts_open(struct inode *inode, struct file *file)
 done_up:
         mutex_unlock(&dev->empress_tsq.vb_lock);
 done:
+        unlock_kernel();
         return err;
 }
 
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 68c268981861..8fd31138f9ad 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1330,6 +1330,8 @@ static int video_open(struct inode *inode, struct file *file)
         struct saa7134_fh *fh;
         enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         int radio = 0;
+
+        lock_kernel();
         list_for_each_entry(dev, &saa7134_devlist, devlist) {
                 if (dev->video_dev && (dev->video_dev->minor == minor))
                         goto found;
@@ -1342,6 +1344,7 @@ static int video_open(struct inode *inode, struct file *file)
                         goto found;
                 }
         }
+        unlock_kernel();
         return -ENODEV;
  found:
 
@@ -1350,8 +1353,10 @@ static int video_open(struct inode *inode, struct file *file)
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh),GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
         file->private_data = fh;
         fh->dev      = dev;
         fh->radio    = radio;
@@ -1384,6 +1389,7 @@ static int video_open(struct inode *inode, struct file *file)
                 /* switch to video/vbi mode */
                 video_mux(dev,dev->ctl_input);
         }
+        unlock_kernel();
         return 0;
 }