From rain_maker@root-forum.org Fri Sep 11 15:24:12 2009 From: "Axel K." Date: Thu, 3 Sep 2009 21:24:19 +0200 Subject: Staging: rt3090: remove possible conflict with rt2860 To: Bartlomiej Zolnierkiewicz Cc: Greg KH Message-ID: <200909032124.21216.rain_maker@root-forum.org> Content-Disposition: inline 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 Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rt3090/pci_main_dev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/staging/rt3090/pci_main_dev.c +++ b/drivers/staging/rt3090/pci_main_dev.c @@ -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)