From 084f0da37a66b89335f4069ad21c6dfecd0e9ba7 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@skynet.be>
Date: Wed, 12 Nov 2008 11:46:43 -0300
Subject: [PATCH] --- yaml --- r: 124215 b: refs/heads/master c:
 23867b2511140ae5693587d2b15badbcc632e3cc h: refs/heads/master i:   124213:
 c258c5bf27a6289b97f7d93e5191c2469db02233   124211:
 fc4c303ced55437bd9ee3cd450fb55051cc7f525   124207:
 78d6b0a1f4bd6190baaf9f424e14f085e89cf29d v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/video/uvc/uvc_v4l2.c  | 7 -------
 trunk/drivers/media/video/uvc/uvc_video.c | 9 +++++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index b84ffaf7f3eb..f592721ecf72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bc6218dc1dc7bd421f3d141241c8e0e70c4e92b
+refs/heads/master: 23867b2511140ae5693587d2b15badbcc632e3cc
diff --git a/trunk/drivers/media/video/uvc/uvc_v4l2.c b/trunk/drivers/media/video/uvc/uvc_v4l2.c
index 624bf74de673..01b48a87a9b9 100644
--- a/trunk/drivers/media/video/uvc/uvc_v4l2.c
+++ b/trunk/drivers/media/video/uvc/uvc_v4l2.c
@@ -252,9 +252,6 @@ static int uvc_v4l2_set_format(struct uvc_video_device *video,
 	if (ret < 0)
 		return ret;
 
-	if ((ret = uvc_commit_video(video, &probe)) < 0)
-		return ret;
-
 	memcpy(&video->streaming->ctrl, &probe, sizeof probe);
 	video->streaming->cur_format = format;
 	video->streaming->cur_frame = frame;
@@ -315,10 +312,6 @@ static int uvc_v4l2_set_streamparm(struct uvc_video_device *video,
 	if ((ret = uvc_probe_video(video, &probe)) < 0)
 		return ret;
 
-	/* Commit the new settings. */
-	if ((ret = uvc_commit_video(video, &probe)) < 0)
-		return ret;
-
 	memcpy(&video->streaming->ctrl, &probe, sizeof probe);
 
 	/* Return the actual frame period. */
diff --git a/trunk/drivers/media/video/uvc/uvc_video.c b/trunk/drivers/media/video/uvc/uvc_video.c
index e07bee98a00a..186ef9fad80b 100644
--- a/trunk/drivers/media/video/uvc/uvc_video.c
+++ b/trunk/drivers/media/video/uvc/uvc_video.c
@@ -889,7 +889,7 @@ int uvc_video_resume(struct uvc_video_device *video)
 
 	video->frozen = 0;
 
-	if ((ret = uvc_set_video_ctrl(video, &video->streaming->ctrl, 0)) < 0) {
+	if ((ret = uvc_commit_video(video, &video->streaming->ctrl)) < 0) {
 		uvc_queue_enable(&video->queue, 0);
 		return ret;
 	}
@@ -970,11 +970,8 @@ int uvc_video_init(struct uvc_video_device *video)
 			break;
 	}
 
-	/* Commit the default settings. */
 	probe->bFormatIndex = format->index;
 	probe->bFrameIndex = frame->bFrameIndex;
-	if ((ret = uvc_set_video_ctrl(video, probe, 0)) < 0)
-		return ret;
 
 	video->streaming->cur_format = format;
 	video->streaming->cur_frame = frame;
@@ -1014,6 +1011,10 @@ int uvc_video_enable(struct uvc_video_device *video, int enable)
 	if ((ret = uvc_queue_enable(&video->queue, 1)) < 0)
 		return ret;
 
+	/* Commit the streaming parameters. */
+	if ((ret = uvc_commit_video(video, &video->streaming->ctrl)) < 0)
+		return ret;
+
 	return uvc_init_video(video, GFP_KERNEL);
 }