Skip to content

Commit

Permalink
Staging: rt3090: remove possible conflict with rt2860
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Axel K authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent 25cf62e commit 7dbefe3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/rt3090/pci_main_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 7dbefe3

Please sign in to comment.