diff options
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 0941f0b434b7..85e61d4b644e 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c | |||
@@ -2394,6 +2394,7 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw) | |||
2394 | hdw->pathway_state)) { | 2394 | hdw->pathway_state)) { |
2395 | /* Change of mode being asked for... */ | 2395 | /* Change of mode being asked for... */ |
2396 | hdw->state_pathway_ok = 0; | 2396 | hdw->state_pathway_ok = 0; |
2397 | trace_stbit("state_pathway_ok",hdw->state_pathway_ok); | ||
2397 | } | 2398 | } |
2398 | if (!hdw->state_pathway_ok) { | 2399 | if (!hdw->state_pathway_ok) { |
2399 | /* Can't commit anything until pathway is ok. */ | 2400 | /* Can't commit anything until pathway is ok. */ |
@@ -3392,6 +3393,7 @@ static int state_eval_pathway_ok(struct pvr2_hdw *hdw) | |||
3392 | } | 3393 | } |
3393 | pvr2_hdw_cmd_modeswitch(hdw,hdw->input_val == PVR2_CVAL_INPUT_DTV); | 3394 | pvr2_hdw_cmd_modeswitch(hdw,hdw->input_val == PVR2_CVAL_INPUT_DTV); |
3394 | hdw->state_pathway_ok = !0; | 3395 | hdw->state_pathway_ok = !0; |
3396 | trace_stbit("state_pathway_ok",hdw->state_pathway_ok); | ||
3395 | return !0; | 3397 | return !0; |
3396 | } | 3398 | } |
3397 | 3399 | ||
@@ -3720,7 +3722,7 @@ static unsigned int pvr2_hdw_report_unlocked(struct pvr2_hdw *hdw,int which, | |||
3720 | case 0: | 3722 | case 0: |
3721 | return scnprintf( | 3723 | return scnprintf( |
3722 | buf,acnt, | 3724 | buf,acnt, |
3723 | "driver:%s%s%s%s%s<mode=%s>", | 3725 | "driver:%s%s%s%s%s <mode=%s>", |
3724 | (hdw->flag_ok ? " <ok>" : " <fail>"), | 3726 | (hdw->flag_ok ? " <ok>" : " <fail>"), |
3725 | (hdw->flag_init_ok ? " <init>" : " <uninitialized>"), | 3727 | (hdw->flag_init_ok ? " <init>" : " <uninitialized>"), |
3726 | (hdw->flag_disconnected ? " <disconnected>" : | 3728 | (hdw->flag_disconnected ? " <disconnected>" : |
@@ -3759,7 +3761,7 @@ static unsigned int pvr2_hdw_report_unlocked(struct pvr2_hdw *hdw,int which, | |||
3759 | (hdw->state_usbstream_run ? | 3761 | (hdw->state_usbstream_run ? |
3760 | " <usb:run>" : " <usb:stop>"), | 3762 | " <usb:run>" : " <usb:stop>"), |
3761 | (hdw->state_pathway_ok ? | 3763 | (hdw->state_pathway_ok ? |
3762 | "<pathway:ok>" : "")); | 3764 | " <pathway:ok>" : "")); |
3763 | break; | 3765 | break; |
3764 | case 3: | 3766 | case 3: |
3765 | return scnprintf( | 3767 | return scnprintf( |