diff --git a/[refs] b/[refs]
index 9d12c28a675a..bc757e6ce5e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83ce57aa45a59e25146a32ee9f68edb7eecacd2b
+refs/heads/master: fa98e594220b86eb3632de478352e93ebf1201fa
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index d4d57951cca2..f30e13f6ee74 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -44,8 +44,10 @@
 #define TIME_MSEC_DECODER_WAIT 50
 
 /* This defines a minimum interval that the encoder must remain quiet
-   before we are allowed to configure it. */
-#define TIME_MSEC_ENCODER_WAIT 50
+   before we are allowed to configure it.  I had this originally set to
+   50msec, but Martin Dauskardt <martin.dauskardt@gmx.de> reports that
+   things work better when it's set to 100msec. */
+#define TIME_MSEC_ENCODER_WAIT 100
 
 /* This defines the minimum interval that the encoder must successfully run
    before we consider that the encoder has run at least once since its