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

[Johannes Stezenbach]

From: Oliver Endriss <o.endriss@xxxxxx>

Disable COM_IF_LOCK workaround for firmware > 0x261f.

Signed-off-by: Oliver Endriss <o.endriss@xxxxxx>
Signed-off-by: Johannes Stezenbach <js@xxxxxxxxxxx>

 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;

--

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/