rtl8192e: reject rtl8192se cards with same PCI ID
authorMike McCormack <mikem@ring3k.org>
Sun, 10 Jul 2011 23:56:20 +0000 (08:56 +0900)
committerLarry Finger <Larry.Finger@lwfinger.net>
Wed, 24 Aug 2011 00:02:07 +0000 (19:02 -0500)
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
drivers/staging/rtl8192e/rtl_core.c

index 81cb13fce6f8b3fa42f8e541f87918fe7342c46c..9551c5ed78426070aa0a9e454f4ced5f18249dbc 100644 (file)
@@ -3558,6 +3558,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
 #endif
        int err = 0;
        bool bdma64 = false;
+       u8 revision_id;
 
        RT_TRACE(COMP_INIT,"Configuring chip resources");
 
@@ -3681,6 +3682,11 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
         pci_write_config_byte(pdev,0x04,0x07);
 #endif
 
+       pci_read_config_byte(pdev, 0x08, &revision_id);
+       /* If the revisionid is 0x10, the device uses rtl8192se. */
+       if (pdev->device == 0x8192 && revision_id == 0x10)
+               goto fail1;
+
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
        priv->ops = ops;
 #else