Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-18 17:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Staging: rt3090: remove possible conflict with rt2860

Browse Source 
Both drivers (rt2860 and rt3090) register themselves as "rt2860" on
loading the module.

In the very rare case of somebody having two cards in his machine, one
using rt3090 and the other one using the rt2860 driver, loading both
modules would be impossible, the second one will not be loaded as the
kernel will tell you that the driver is already registered.

This was also present with rt2870/rt3070 (with both driver registering
as "rt2870"), but the code has been merged to one driver recently.

The follwoing patch fixes this potential problem until merging of
rt2860/rt3090 code to a single driver.

Signed-off-by: Axel Koellhofer <rain_maker@root-forum.org>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Axel K 2009-09-03 21:24:19 +02:00 committed by Greg Kroah-Hartman
parent 25cf62e431
commit 7dbefe3d58
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/rt3090/pci_main_dev.c
View File

@ -106,7 +106,7 @@ MODULE_VERSION(STA_DRIVER_VERSION);
//
static struct pci_driver rt2860_driver =
{
name: "rt2860",
name: "rt3090",
id_table: rt2860_pci_tbl,
probe: rt2860_probe,
#if LINUX_VERSION_CODE >= 0x20412
@ -326,9 +326,9 @@ static INT __devinit rt2860_probe(
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
print_name = pci_dev ? pci_name(pci_dev) : "rt2860";
print_name = pci_dev ? pci_name(pci_dev) : "rt3090";
#else
print_name = pci_dev ? pci_dev->slot_name : "rt2860";
print_name = pci_dev ? pci_dev->slot_name : "rt3090";
#endif // LINUX_VERSION_CODE //
if ((rv = pci_request_regions(pci_dev, print_name)) != 0)