V4L/DVB (3314): Fixed em28xx based system lockup

[pandora-kernel.git] / drivers / media / video / em28xx / em28xx-video.c

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 1726b2c..1c1557d 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -383,12 +383,14 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
                em28xx_capture_start(dev, 1);
                em28xx_resolution_set(dev);
 
+               /* device needs to be initialized before isoc transfer */
+               video_mux(dev, 0);
+
                /* start the transfer */
                errCode = em28xx_init_isoc(dev);
                if (errCode)
                        goto err;
 
-               video_mux(dev, 0);
        }
 
        dev->users++;