Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4823e9ee9f45c78777d040742b5e46336a42c8b3
Commit:     4823e9ee9f45c78777d040742b5e46336a42c8b3
Parent:     426d523664e01c778f6455e9b3bbd40dda76c66a
Author:     Steven Toth <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 22 20:52:21 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:08:17 2007 -0300

    V4L/DVB (6167): cx23885: Changed PCI quirks to after bridge detech
    
    Changed the pci_quirks function to detech the bridge type before setting
    the NMI clear bit, rather than detecting based on unique board id.
    
    Signed-off-by: Steven Toth <[EMAIL PROTECTED]>
    Signed-off-by: Michael Krufky <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/cx23885/cx23885-core.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/media/video/cx23885/cx23885-core.c 
b/drivers/media/video/cx23885/cx23885-core.c
index 6916729..d2bc3e5 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/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);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to