1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 9a1374a38ec7..1b7e2e44b802 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1057,12 +1057,15 @@ static int mpeg_open(struct inode *inode, struct file *file)
         struct cx8802_driver *drv = NULL;
         int err;
 
+        lock_kernel();
         dev = cx8802_get_device(inode);
 
         dprintk( 1, "%s\n", __func__);
 
-        if (dev == NULL)
+        if (dev == NULL) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         /* Make sure we can acquire the hardware */
         drv = cx8802_get_driver(dev, CX88_MPEG_BLACKBIRD);
@@ -1077,6 +1080,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
         if (blackbird_initialize_codec(dev) < 0) {
                 if (drv)
                         drv->request_release(drv);
+                unlock_kernel();
                 return -EINVAL;
         }
         dprintk(1,"open minor=%d\n",minor);
@@ -1086,6 +1090,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
         if (NULL == fh) {
                 if (drv)
                         drv->request_release(drv);
+                unlock_kernel();
                 return -ENOMEM;
         }
         file->private_data = fh;
@@ -1101,6 +1106,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
         /* FIXME: locking against other video device */
         cx88_set_scale(dev->core, dev->width, dev->height,
                         fh->mpegq.field);
+        unlock_kernel();
 
         return 0;
 }