[DVB patch 50/54] av7110: conditionally disable workaround for broken firmware

Johannes Stezenbach
2005-09-04T23:37:13Z

[-- Attachment #1: dvb-ttpci-av7110-remove-workaround.patch --]
[-- Type: text/plain, Size: 1084 bytes --]

From: Oliver Endriss <o.endriss@gmx.de>

Disable COM_IF_LOCK workaround for firmware > 0x261f.

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>

drivers/media/dvb/ttpci/av7110_hw.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

--- linux-2.6.13-git4.orig/drivers/media/dvb/ttpci/av7110_hw.c 2005-09-04 22:30:58.000000000 +0200
+++ linux-2.6.13-git4/drivers/media/dvb/ttpci/av7110_hw.c 2005-09-04 22:30:59.000000000 +0200
@@ -366,7 +366,8 @@ static int __av7110_send_fw_cmd(struct a
msleep(1);
}

- wdebi(av7110, DEBINOSWAP, COM_IF_LOCK, 0xffff, 2);
+ if (FW_VERSION(av7110->arm_app) <= 0x261f)
+ wdebi(av7110, DEBINOSWAP, COM_IF_LOCK, 0xffff, 2);

#ifndef _NOHANDSHAKE
start = jiffies;
@@ -439,7 +440,8 @@ static int __av7110_send_fw_cmd(struct a

wdebi(av7110, DEBINOSWAP, COMMAND, (u32) buf[0], 2);

- wdebi(av7110, DEBINOSWAP, COM_IF_LOCK, 0x0000, 2);
+ if (FW_VERSION(av7110->arm_app) <= 0x261f)
+ wdebi(av7110, DEBINOSWAP, COM_IF_LOCK, 0x0000, 2);

#ifdef COM_DEBUG
start = jiffies;

--