Skip to content

Commit

Permalink
[SCSI] gdth: fix Error: Driver 'gdth' is already registered, aborting...
Browse files Browse the repository at this point in the history
This message appears on modprobe/rmmod/modprobe of the driver.  It's
caused because if the driver has no instances, it returns an error
from gdth_init, which causes the module to fail to load.
Unfortunately, the module's pci driver is still registered at this
point.

Fix this by making gdth behave like a modern driver and insert even if
it doesn't find any instances (in case of hot plug or software driven
binding).

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
  • Loading branch information
James Bottomley authored and James Bottomley committed May 8, 2008
1 parent 2d6f0d0 commit a85591f
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions drivers/scsi/gdth.c
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,6 @@ static int __init gdth_search_isa(ulong32 bios_adr)
#endif /* CONFIG_ISA */

#ifdef CONFIG_PCI
static bool gdth_pci_registered;

static bool gdth_search_vortex(ushort device)
{
Expand Down Expand Up @@ -5157,8 +5156,13 @@ static int __init gdth_init(void)

#ifdef CONFIG_PCI
/* scanning for PCI controllers */
if (pci_register_driver(&gdth_pci_driver) == 0)
gdth_pci_registered = true;
if (pci_register_driver(&gdth_pci_driver)) {
gdth_ha_str *ha;

list_for_each_entry(ha, &gdth_instances, list)
gdth_remove_one(ha);
return -ENODEV;
}
#endif /* CONFIG_PCI */

TRACE2(("gdth_detect() %d controller detected\n", gdth_ctr_count));
Expand All @@ -5181,8 +5185,7 @@ static void __exit gdth_exit(void)
#endif

#ifdef CONFIG_PCI
if (gdth_pci_registered)
pci_unregister_driver(&gdth_pci_driver);
pci_unregister_driver(&gdth_pci_driver);
#endif

list_for_each_entry(ha, &gdth_instances, list)
Expand Down

0 comments on commit a85591f

Please sign in to comment.