diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-17 11:40:22 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-17 11:40:22 -0200 |
| commit | c6b71147f1371e784ded6481d60962132c3bd7d3 (patch) | |
| tree | 7d5f3d63aff2024b990f5386dcf6aa5aa3334886 /linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c | |
| parent | 0ac81e8228715c26c7dbd6e57ea910f570741774 (diff) | |
| parent | 66439930c41982012b1fdf0913120a1317019df3 (diff) | |
| download | mediapointer-dvb-s2-c6b71147f1371e784ded6481d60962132c3bd7d3.tar.gz mediapointer-dvb-s2-c6b71147f1371e784ded6481d60962132c3bd7d3.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/kernel-sync
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 91f27facb..328bd1ba6 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -1258,6 +1258,8 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw) time we configure the encoder, then we'll fully configure it. */ hdw->enc_cur_valid = 0; + hdw->flag_encoder_ok = 0; + /* First prepare firmware loading */ ret |= pvr2_write_register(hdw, 0x0048, 0xffffffff); /*interrupt mask*/ ret |= pvr2_hdw_gpio_chg_dir(hdw,0xffffffff,0x00000088); /*gpio dir*/ @@ -1356,6 +1358,7 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw) pvr2_trace(PVR2_TRACE_ERROR_LEGS, "firmware2 upload post-proc failure"); } else { + hdw->flag_encoder_ok = !0; hdw->subsys_enabled_mask |= (1<<PVR2_SUBSYS_B_ENC_FIRMWARE); } return ret; |