[PATCH] staging: r8192e_pci: Handle duplicate PCI ID0x10ec:0x8192 conflict with rtl8192se

From: Larry Finger
Date: Sat Jun 18 2011 - 23:34:54 EST

There are two devices with PCI ID 0x10ec:0x8192, namely RTL8192E and
RTL8192SE. The method of distinguishing them is by the revision ID
at offset 0x8 of the PCI configuration space. If the value is 0x10,
then the device uses rtl8192se for a driver.

Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Cc: Stable <stable@xxxxxxxxxx>


This patch should be applied to kernel 3.0 to prevent problems if both
rtl8192se and r8192e_pci are configured. There is a similar patch to
rtl8192se that is submitted to John Linville's tree. As r8192e_pci
is in older kernels, this patch should also be applied to stable.


Index: wireless-testing-new/drivers/staging/rtl8192e/r8192E_core.c
--- wireless-testing-new.orig/drivers/staging/rtl8192e/r8192E_core.c
+++ wireless-testing-new/drivers/staging/rtl8192e/r8192E_core.c
@@ -4532,6 +4532,7 @@ static int __devinit rtl8192_pci_probe(s
u8 unit = 0;
int ret = -ENODEV;
unsigned long pmem_start, pmem_len, pmem_flags;
+ u8 revisionid;

RT_TRACE(COMP_INIT,"Configuring chip resources\n");

@@ -4592,6 +4593,11 @@ static int __devinit rtl8192_pci_probe(s
pci_write_config_byte(pdev, 0x41, 0x00);

+ pci_read_config_byte(pdev, 0x08, &revisionid);
+ /* If the revisionid is 0x10, the device uses rtl8192se. */
+ if (pdev->device == 0x8192 && revisionid == 0x10)
+ goto fail1;
pci_read_config_byte(pdev, 0x05, &unit);
pci_write_config_byte(pdev, 0x05, unit & (~0x04));

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/