From 8a13956a247fa8be0064de53946f36a963bb2eb9 Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@hauppauge.com>
Date: Wed, 22 Aug 2007 20:52:21 -0300
Subject: [PATCH] --- yaml --- r: 65856 b: refs/heads/master c:
 4823e9ee9f45c78777d040742b5e46336a42c8b3 h: refs/heads/master v: v3

---
 [refs]                                           |  2 +-
 trunk/drivers/media/video/cx23885/cx23885-core.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 0b72cefff92e..6442aacc287b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 426d523664e01c778f6455e9b3bbd40dda76c66a
+refs/heads/master: 4823e9ee9f45c78777d040742b5e46336a42c8b3
diff --git a/trunk/drivers/media/video/cx23885/cx23885-core.c b/trunk/drivers/media/video/cx23885/cx23885-core.c
index 691672947084..d2bc3e586623 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-core.c
+++ b/trunk/drivers/media/video/cx23885/cx23885-core.c
@@ -622,11 +622,9 @@ static int cx23885_pci_quirks(struct cx23885_dev *dev)
 {
 	dprintk(1, "%s()\n", __FUNCTION__);
 
-	switch(dev->board) {
-	case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
+	if(dev->bridge == CX23885_BRIDGE_885)
 		cx_clear(RDR_TLCTL0, 1 << 4);
-		break;
-	}
+
 	return 0;
 }
 
@@ -777,8 +775,6 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
 	       dev->board, card[dev->nr] == dev->board ?
 	       "insmod option" : "autodetected");
 
-	cx23885_pci_quirks(dev);
-
 	/* Configure the internal memory */
 	if(dev->pci->device == 0x8880) {
 		dev->bridge = CX23885_BRIDGE_887;
@@ -791,6 +787,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
 	dprintk(1, "%s() Memory configured for PCIe bridge type %d\n",
 		__FUNCTION__, dev->bridge);
 
+	cx23885_pci_quirks(dev);
+
 	/* init hardware */
 	cx23885_reset(dev);