This is a note to let you know that I've just added the patch titled
staging: r8192e_pci: Handle duplicate PCI ID 0x10ec:0x8192
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
staging-r8192e_pci-handle-duplicate-pci-id-0x10ec-0x8192.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 1c50bf7e415cf6ce9545dbecc2ac0d89d3916c53 Mon Sep 17 00:00:00 2001
From: Larry Finger <[email protected]>
Date: Sat, 18 Jun 2011 22:34:34 -0500
Subject: staging: r8192e_pci: Handle duplicate PCI ID 0x10ec:0x8192
conflict with rtl8192se
From: Larry Finger <[email protected]>
commit 1c50bf7e415cf6ce9545dbecc2ac0d89d3916c53 upstream.
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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/staging/rtl8192e/r8192E_core.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/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));
Patches currently in stable-queue which might be from [email protected]
are
queue-3.0/staging-r8192e_pci-handle-duplicate-pci-id-0x10ec-0x8192.patch
queue-3.0/usb-ohci-fix-another-regression-for-nvidia-controllers.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
