Commit 7990b19d authored by David S. Miller's avatar David S. Miller

[ESP]: Fix abort return values.

parent 5b165f9b
...@@ -1955,7 +1955,7 @@ int esp_abort(Scsi_Cmnd *SCptr) ...@@ -1955,7 +1955,7 @@ int esp_abort(Scsi_Cmnd *SCptr)
esp->msgout_ctr = 0; esp->msgout_ctr = 0;
esp_cmd(esp, ESP_CMD_SATN); esp_cmd(esp, ESP_CMD_SATN);
spin_unlock_irqrestore(esp->ehost->host_lock, flags); spin_unlock_irqrestore(esp->ehost->host_lock, flags);
return SCSI_ABORT_PENDING; return SUCCESS;
} }
/* If it is still in the issue queue then we can safely /* If it is still in the issue queue then we can safely
...@@ -1984,7 +1984,7 @@ int esp_abort(Scsi_Cmnd *SCptr) ...@@ -1984,7 +1984,7 @@ int esp_abort(Scsi_Cmnd *SCptr)
ESP_INTSON(esp->dregs); ESP_INTSON(esp->dregs);
spin_unlock_irqrestore(esp->ehost->host_lock, flags); spin_unlock_irqrestore(esp->ehost->host_lock, flags);
return SCSI_ABORT_SUCCESS; return SUCCESS;
} }
} }
} }
...@@ -1998,20 +1998,20 @@ int esp_abort(Scsi_Cmnd *SCptr) ...@@ -1998,20 +1998,20 @@ int esp_abort(Scsi_Cmnd *SCptr)
if (don) if (don)
ESP_INTSON(esp->dregs); ESP_INTSON(esp->dregs);
spin_unlock_irqrestore(esp->ehost->host_lock, flags); spin_unlock_irqrestore(esp->ehost->host_lock, flags);
return SCSI_ABORT_BUSY; return FAILED;
} }
/* It's disconnected, we have to reconnect to re-establish /* It's disconnected, we have to reconnect to re-establish
* the nexus and tell the device to abort. However, we really * the nexus and tell the device to abort. However, we really
* cannot 'reconnect' per se, therefore we tell the upper layer * cannot 'reconnect' per se. Don't try to be fancy, just
* the safest thing we can. This is, wait a bit, if nothing * indicate failure, which causes our caller to reset the whole
* happens, we are really hung so reset the bus. * bus.
*/ */
if (don) if (don)
ESP_INTSON(esp->dregs); ESP_INTSON(esp->dregs);
spin_unlock_irqrestore(esp->ehost->host_lock, flags); spin_unlock_irqrestore(esp->ehost->host_lock, flags);
return SCSI_ABORT_SNOOZE; return FAILED;
} }
/* We've sent ESP_CMD_RS to the ESP, the interrupt had just /* We've sent ESP_CMD_RS to the ESP, the interrupt had just
......
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