diff options
author | Scott Murray <scottm@somanetworks.com> | 2007-04-13 18:34:26 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-05-02 22:02:40 -0400 |
commit | 03555d591d2c8ee9291db171c0d21d3c9cab04d9 (patch) | |
tree | 9017400c9c5b6f92cf1d74d3a979c2b9657c2815 /drivers/pci | |
parent | ac1f0e9923356652f21756526e194a4a1a37dd38 (diff) |
PCI: ZT5550 CPCI Hotplug driver fix
cc: Philip Guo <pg@cs.stanford.edu>
Here's a small patch against the current git tree for the ZT5550 CPCI
hotplug driver to fix an issue with port freeing that Philip Guo found.
Signed-off-by: Scott Murray <scottm@somanetworks.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/hotplug/cpcihp_zt5550.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c index 1c12e9171097..41f6a8d79c81 100644 --- a/drivers/pci/hotplug/cpcihp_zt5550.c +++ b/drivers/pci/hotplug/cpcihp_zt5550.c | |||
@@ -296,13 +296,17 @@ static struct pci_driver zt5550_hc_driver = { | |||
296 | static int __init zt5550_init(void) | 296 | static int __init zt5550_init(void) |
297 | { | 297 | { |
298 | struct resource* r; | 298 | struct resource* r; |
299 | int rc; | ||
299 | 300 | ||
300 | info(DRIVER_DESC " version: " DRIVER_VERSION); | 301 | info(DRIVER_DESC " version: " DRIVER_VERSION); |
301 | r = request_region(ENUM_PORT, 1, "#ENUM hotswap signal register"); | 302 | r = request_region(ENUM_PORT, 1, "#ENUM hotswap signal register"); |
302 | if(!r) | 303 | if(!r) |
303 | return -EBUSY; | 304 | return -EBUSY; |
304 | 305 | ||
305 | return pci_register_driver(&zt5550_hc_driver); | 306 | rc = pci_register_driver(&zt5550_hc_driver); |
307 | if(rc < 0) | ||
308 | release_region(ENUM_PORT, 1); | ||
309 | return rc; | ||
306 | } | 310 | } |
307 | 311 | ||
308 | static void __exit | 312 | static void __exit |