V4L/DVB (9570): uvcvideo: Handle failed video GET_{MIN|MAX|DEF} requests more gracefully

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / uvc / uvc_v4l2.c

diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index 8361367806a98f89e171b4f075b91a199dcdd1d2..624bf74de673468b30ad786886ab75052ef9645d 100644 (file)
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -252,7 +252,7 @@ static int uvc_v4l2_set_format(struct uvc_video_device *video,
        if (ret < 0)
                return ret;
 
-       if ((ret = uvc_set_video_ctrl(video, &probe, 0)) < 0)
+       if ((ret = uvc_commit_video(video, &probe)) < 0)
                return ret;
 
        memcpy(&video->streaming->ctrl, &probe, sizeof probe);
@@ -316,7 +316,7 @@ static int uvc_v4l2_set_streamparm(struct uvc_video_device *video,
                return ret;
 
        /* Commit the new settings. */
-       if ((ret = uvc_set_video_ctrl(video, &probe, 0)) < 0)
+       if ((ret = uvc_commit_video(video, &probe)) < 0)
                return ret;
 
        memcpy(&video->streaming->ctrl, &probe, sizeof probe);