diff --git a/[refs] b/[refs]
index 30247f0b0bf6..d9b685feff27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb8e0ee4f51a89d569c01d5b09a8cbc935c72a4c
+refs/heads/master: b46cfa805ed12c11fea0adc8e4058000c2e67314
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 1829029cc9b9..45faabe96584 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2111,17 +2111,7 @@ int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw)
 	}
 
 	if (hdw->std_dirty ||
-	    hdw->interlace_dirty ||
-	    hdw->vbr_dirty ||
-	    hdw->videobitrate_dirty ||
-	    hdw->videopeak_dirty ||
-	    hdw->audiobitrate_dirty ||
-	    hdw->audiolayer_dirty ||
-	    hdw->audiocrc_dirty ||
-	    hdw->audioemphasis_dirty ||
-	    hdw->srate_dirty ||
-	    hdw->res_ver_dirty ||
-	    hdw->res_hor_dirty) {
+	    0) {
 		/* If any of this changes, then the encoder needs to be
 		   reconfigured, and we need to reset the stream. */
 		stale_subsys_mask |= (1<<PVR2_SUBSYS_B_ENC_CFG);