1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index ee5e2338b41..5a2022c0152 100644
--- a/drivers/media/video/uvc/uvc_video.c
+++ b/drivers/media/video/uvc/uvc_video.c
@@ -138,6 +138,15 @@ static void uvc_fixup_video_ctrl(struct uvc_streaming *stream,
                         bandwidth /= 8;
                 bandwidth += 12;
 
+                /* The bandwidth estimate is too low for many cameras. Don't use
+                 * maximum packet sizes lower than 1024 bytes to try and work
+                 * around the problem. According to measurements done on two
+                 * different camera models, the value is high enough to get most
+                 * resolutions working while not preventing two simultaneous
+                 * VGA streams at 15 fps.
+                 */
+                bandwidth = max_t(u32, bandwidth, 1024);
+
                 ctrl->dwMaxPayloadTransferSize = bandwidth;
         }
 }