V4L/DVB (7696): pvrusb2: state control tweak

[deliverable/linux.git] / drivers / media / video / pvrusb2 / pvrusb2-hdw.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 6a820b713fec4e43d3f13303adec66b434d3c1eb..307a38d91c85a6cda6d12d000f2cc457e59a493d 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/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)) {