diff options
| author | Mike McCormack <mikem@ring3k.org> | 2011-07-11 08:56:20 +0900 |
|---|---|---|
| committer | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-23 19:02:07 -0500 |
| commit | 1ec3e2f255c597c4bff693d0b045a49b12c5bb90 (patch) | |
| tree | 55074b05eaa25bb15685d728591748d1f5ab06b7 /drivers/staging/rtl8192e | |
| parent | 94a799425eee8225a1e3fbe5f473d2ef04002577 (diff) | |
| download | op-kernel-dev-1ec3e2f255c597c4bff693d0b045a49b12c5bb90.zip op-kernel-dev-1ec3e2f255c597c4bff693d0b045a49b12c5bb90.tar.gz | |
rtl8192e: reject rtl8192se cards with same PCI ID
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Diffstat (limited to 'drivers/staging/rtl8192e')
| -rw-r--r-- | drivers/staging/rtl8192e/rtl_core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c index 81cb13f..9551c5e 100644 --- a/drivers/staging/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl_core.c @@ -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 |
