From 86234b1a16820972ca0f297bca93a56a97fcec9b Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Sun, 4 May 2008 22:35:58 -0500 Subject: [PATCH] --- yaml --- r: 96517 b: refs/heads/master c: a85591fd0baf4ed3f03ee1aaac6a985e400cf089 h: refs/heads/master i: 96515: e1ceb268effebe0ddf02aa33842cb9540ec22a08 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/gdth.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ceb54ea0a8f0..97c02ec71fa1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d6f0d0cd94f9b8b24102300d8dd9cbbd1688826 +refs/heads/master: a85591fd0baf4ed3f03ee1aaac6a985e400cf089 diff --git a/trunk/drivers/scsi/gdth.c b/trunk/drivers/scsi/gdth.c index 16785a2ad035..46771d4c81bd 100644 --- a/trunk/drivers/scsi/gdth.c +++ b/trunk/drivers/scsi/gdth.c @@ -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) { @@ -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)); @@ -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)