1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index a5217a2cf4c0..f051c6aa7f1f 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -250,6 +250,7 @@ struct pvr2_fx2cmd_descdef {
 static const struct pvr2_fx2cmd_descdef pvr2_fx2cmd_desc[] = {
         {FX2CMD_MEM_WRITE_DWORD, "write encoder dword"},
         {FX2CMD_MEM_READ_DWORD, "read encoder dword"},
+        {FX2CMD_HCW_ZILOG_RESET, "zilog IR reset control"},
         {FX2CMD_MEM_READ_64BYTES, "read encoder 64bytes"},
         {FX2CMD_REG_WRITE, "write encoder register"},
         {FX2CMD_REG_READ, "read encoder register"},
@@ -1711,6 +1712,14 @@ static void pvr2_hdw_setup_low(struct pvr2_hdw *hdw)
                 if (!pvr2_hdw_dev_ok(hdw)) return;
         }
 
+        /* Take the IR chip out of reset, if appropriate */
+        if (hdw->hdw_desc->ir_scheme == PVR2_IR_SCHEME_ZILOG) {
+                pvr2_issue_simple_cmd(hdw,
+                                      FX2CMD_HCW_ZILOG_RESET |
+                                      (1 << 8) |
+                                      ((0) << 16));
+        }
+
         // This step MUST happen after the earlier powerup step.
         pvr2_i2c_core_init(hdw);
         if (!pvr2_hdw_dev_ok(hdw)) return;