diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 6a820b7..307a38d 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2401,7 +2401,7 @@
 		}
 	}
 
-	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)) {