lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtl8192e: reject rtl8192se cards with same PCI ID

Browse Source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
This commit is contained in:
Mike McCormack
2011-07-11 08:56:20 +09:00
committed by Larry Finger
parent 94a799425e
commit 1ec3e2f255
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/rtl8192e/rtl_core.c
View File

@@ -3558,6 +3558,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
#endif #endif
int err = 0; int err = 0;
bool bdma64 = false; bool bdma64 = false;
u8 revision_id;
RT_TRACE(COMP_INIT,"Configuring chip resources"); 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); pci_write_config_byte(pdev,0x04,0x07);
#endif #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) #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
priv->ops = ops; priv->ops = ops;
#else #else