Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e1b68c4dcfb8bb7d79b6771e48767039ffbe00a8
Commit: e1b68c4dcfb8bb7d79b6771e48767039ffbe00a8
Parent: 95ffc5e314e2bba87ec012c6e3adc487c5a7b4bb
Author: Kristian Høgsberg <[EMAIL PROTECTED]>
AuthorDate: Wed May 9 19:23:09 2007 -0400
Committer: Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Thu May 10 18:24:14 2007 +0200
firewire: Return SCSI_MLQUEUE_HOST_BUSY for out of memory cases in
queuecommand.
Signed-off-by: Kristian Hoegsberg <[EMAIL PROTECTED]>
Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
---
drivers/firewire/fw-sbp2.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index c32254e..07be24e 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -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) {
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);
@@ -1093,9 +1095,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd,
scsi_done_fn_t done)
fail_mapping:
kfree(orb);
fail_alloc:
- cmd->result = DID_ERROR << 16;
- done(cmd);
- return 0;
+ return SCSI_MLQUEUE_HOST_BUSY;
}
static int sbp2_scsi_slave_alloc(struct scsi_device *sdev)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
