1
0
Fork 0

[PATCH] libata: Fixup ata_sas_queuecmd to handle __ata_scsi_queuecmd failure

Fixes ata_sas_queuecmd to properly handle a failure from
__ata_scsi_queuecmd.

Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
hifive-unleashed-5.1
Brian King 2006-11-20 13:51:56 -06:00 committed by Jeff Garzik
parent f33d625f40
commit 08475a1920
1 changed files with 6 additions and 3 deletions

View File

@ -3347,20 +3347,23 @@ EXPORT_SYMBOL_GPL(ata_sas_slave_configure);
* @ap: ATA port to which the command is being sent * @ap: ATA port to which the command is being sent
* *
* RETURNS: * RETURNS:
* Zero. * Return value from __ata_scsi_queuecmd() if @cmd can be queued,
* 0 otherwise.
*/ */
int ata_sas_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *), int ata_sas_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *),
struct ata_port *ap) struct ata_port *ap)
{ {
int rc = 0;
ata_scsi_dump_cdb(ap, cmd); ata_scsi_dump_cdb(ap, cmd);
if (likely(ata_scsi_dev_enabled(ap->device))) if (likely(ata_scsi_dev_enabled(ap->device)))
__ata_scsi_queuecmd(cmd, done, ap->device); rc = __ata_scsi_queuecmd(cmd, done, ap->device);
else { else {
cmd->result = (DID_BAD_TARGET << 16); cmd->result = (DID_BAD_TARGET << 16);
done(cmd); done(cmd);
} }
return 0; return rc;
} }
EXPORT_SYMBOL_GPL(ata_sas_queuecmd); EXPORT_SYMBOL_GPL(ata_sas_queuecmd);