lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

firewire: Return SCSI_MLQUEUE_HOST_BUSY for out of memory cases in queuecommand.

Browse Source 
Signed-off-by: Kristian Hoegsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Kristian Høgsberg
2007-05-09 19:23:09 -04:00
committed by Stefan Richter
parent 95ffc5e314
commit e1b68c4dcf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/firewire/fw-sbp2.c
View File

@@ -1017,7 +1017,9 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
*/ */
if (cmd->sc_data_direction == DMA_BIDIRECTIONAL) { if (cmd->sc_data_direction == DMA_BIDIRECTIONAL) {
fw_error("Cannot handle DMA_BIDIRECTIONAL - rejecting command"); fw_error("Cannot handle DMA_BIDIRECTIONAL - rejecting command");
goto fail_alloc; cmd->result = DID_ERROR << 16;
done(cmd);
return 0;
} }
orb = kzalloc(sizeof *orb, GFP_ATOMIC); orb = kzalloc(sizeof *orb, GFP_ATOMIC);
@@ -1093,9 +1095,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
fail_mapping: fail_mapping:
kfree(orb); kfree(orb);
fail_alloc: fail_alloc:
cmd->result = DID_ERROR << 16; return SCSI_MLQUEUE_HOST_BUSY;
done(cmd);
return 0;
} }
static int sbp2_scsi_slave_alloc(struct scsi_device *sdev) static int sbp2_scsi_slave_alloc(struct scsi_device *sdev)