From fc5d5fd7cc3aad77fd8e7248b23e200a6cbe7b8d Mon Sep 17 00:00:00 2001
From: Markus Rechberger <mrechberger@gmail.com>
Date: Tue, 7 Feb 2006 06:49:13 -0200
Subject: [PATCH] --- yaml --- r: 21632 b: refs/heads/master c:
 e5d4a56d5d824e4dfe7d065d0fedb02e63952710 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/em28xx/em28xx-video.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 829236569163..8c081d92fbbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21d06544a745a09cc1e9ce5376a61b074bfce379
+refs/heads/master: e5d4a56d5d824e4dfe7d065d0fedb02e63952710
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
index 1726b2c26b6c..1c1557d9bace 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-video.c
+++ b/trunk/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++;