i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: checks for B_OK instead of SCSI_REQ_CMP in scsi_scan_bus()

Browse Source 
* scsi_scan_lun() actually returns a status_t
This commit is contained in:
Jérôme Duval
2013-11-09 13:09:16 +01:00
parent ecadc4c696
commit 21f7dc3d40
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/scsi/device_scan.cpp
+4 -4
View File
@@ -225,7 +225,7 @@ scsi_scan_lun(scsi_bus_info *bus, uchar target_id, uchar target_lun)
// the bus_manager should really take care of // the bus_manager should really take care of
res = scsi_register_device(bus, target_id, target_lun, &new_inquiry_data); res = scsi_register_device(bus, target_id, target_lun, &new_inquiry_data);
if (res == B_NAME_IN_USE) { if (res == B_NAME_IN_USE) {
SHOW_FLOW0(3, "name in use"); SHOW_FLOW0(3, "name in use");
if (scsi_force_get_device(bus, target_id, target_lun, &device) != B_OK) if (scsi_force_get_device(bus, target_id, target_lun, &device) != B_OK)
return B_OK; return B_OK;
// the device was already registered, let's tell our child to rescan it // the device was already registered, let's tell our child to rescan it
@@ -282,14 +282,14 @@ scsi_scan_bus(scsi_bus_info *bus)
// anything but LUN 0, so we should probably add a black-list // anything but LUN 0, so we should probably add a black-list
// or something // or something
for (lun = 0; lun <= MAX_LUN_ID; ++lun) { for (lun = 0; lun <= MAX_LUN_ID; ++lun) {
status_t res; status_t status;
SHOW_FLOW(3, "lun: %d", lun); SHOW_FLOW(3, "lun: %d", lun);
res = scsi_scan_lun(bus, target_id, lun); status = scsi_scan_lun(bus, target_id, lun);
// if there is no device at lun 0, there's probably no device at all // if there is no device at lun 0, there's probably no device at all
if (lun == 0 && res != SCSI_REQ_CMP) if (lun == 0 && status != B_OK)
break; break;
} }
} }