diff --git a/[refs] b/[refs]
index bb712665e5c7..8bcedd1ffb1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98e184d978c9fdd294c169e468ab4a3e51a8be2d
+refs/heads/master: 38d9a2cf2db30b37dde81ec5f8b4de0fd9843ccc
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 6a820b713fec..307a38d91c85 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2401,7 +2401,7 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw)
 		}
 	}
 
-	if (hdw->input_dirty &&
+	if (hdw->input_dirty && hdw->state_pathway_ok &&
 	    (((hdw->input_val == PVR2_CVAL_INPUT_DTV) ?
 	      PVR2_PATHWAY_DIGITAL : PVR2_PATHWAY_ANALOG) !=
 	     hdw->pathway_state)) {