Commit a1699d96 authored by William Stinson's avatar William Stinson Committed by Jeff Garzik

request_region janitor updates for BusLogic SCSI driver.

parent eb0b7bb2
...@@ -2792,8 +2792,8 @@ int BusLogic_DetectHostAdapter(SCSI_Host_Template_T *HostTemplate) ...@@ -2792,8 +2792,8 @@ int BusLogic_DetectHostAdapter(SCSI_Host_Template_T *HostTemplate)
released, thereby preventing it from being incorrectly identified as released, thereby preventing it from being incorrectly identified as
any other type of Host Adapter. any other type of Host Adapter.
*/ */
request_region(HostAdapter->IO_Address, HostAdapter->AddressCount, if (!request_region(HostAdapter->IO_Address, HostAdapter->AddressCount,
"BusLogic"); "BusLogic")) continue;
/* /*
Register the SCSI Host structure. Register the SCSI Host structure.
*/ */
...@@ -2834,12 +2834,21 @@ int BusLogic_DetectHostAdapter(SCSI_Host_Template_T *HostTemplate) ...@@ -2834,12 +2834,21 @@ int BusLogic_DetectHostAdapter(SCSI_Host_Template_T *HostTemplate)
*/ */
release_region(HostAdapter->IO_Address, release_region(HostAdapter->IO_Address,
HostAdapter->AddressCount); HostAdapter->AddressCount);
request_region(HostAdapter->IO_Address, if(!request_region(HostAdapter->IO_Address,
HostAdapter->AddressCount, HostAdapter->AddressCount,
HostAdapter->FullModelName); HostAdapter->FullModelName)) {
printk(KERN_WARNING "BusLogic: Release and re-register of "
"port 0x%04lx failed \n", HostAdapter->IO_Address);
BusLogic_DestroyCCBs(HostAdapter);
BusLogic_ReleaseResources(HostAdapter);
BusLogic_UnregisterHostAdapter(HostAdapter);
scsi_unregister(Host);
}
else {
BusLogic_InitializeHostStructure(HostAdapter, Host); BusLogic_InitializeHostStructure(HostAdapter, Host);
BusLogicHostAdapterCount++; BusLogicHostAdapterCount++;
} }
}
else else
{ {
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment