2 files changed, 5 insertions, 11 deletions

diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index 624bf74de673..01b48a87a9b9 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/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/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index e07bee98a00a..186ef9fad80b 100644
--- a/drivers/media/video/uvc/uvc_video.c
+++ b/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);
 }