1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index c2690df33438..db6b828594f5 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -357,7 +357,7 @@ static int usbvision_v4l2_open(struct file *file)
 
         PDEBUG(DBG_IO, "open");
 
-        lock_kernel();
+        mutex_lock(&usbvision->lock);
         usbvision_reset_powerOffTimer(usbvision);
 
         if (usbvision->user)
@@ -379,7 +379,6 @@ static int usbvision_v4l2_open(struct file *file)
 
         /* If so far no errors then we shall start the camera */
         if (!errCode) {
-                mutex_lock(&usbvision->lock);
                 if (usbvision->power == 0) {
                         usbvision_power_on(usbvision);
                         usbvision_i2c_register(usbvision);
@@ -408,14 +407,13 @@ static int usbvision_v4l2_open(struct file *file)
                                 usbvision->initialized = 0;
                         }
                 }
-                mutex_unlock(&usbvision->lock);
         }
 
         /* prepare queues */
         usbvision_empty_framequeues(usbvision);
 
         PDEBUG(DBG_IO, "success");
-        unlock_kernel();
+        mutex_unlock(&usbvision->lock);
         return errCode;
 }
 
@@ -1645,8 +1643,8 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
         usbvision->usb_bandwidth = 0;
         usbvision->user = 0;
         usbvision->streaming = Stream_Off;
-        usbvision_register_video(usbvision);
         usbvision_configure_video(usbvision);
+        usbvision_register_video(usbvision);
         mutex_unlock(&usbvision->lock);
 
         usbvision_create_sysfs(usbvision->vdev);