Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1b68c4d authored by Kristian Høgsberg's avatar Kristian Høgsberg Committed by Stefan Richter
Browse files

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



Signed-off-by: default avatarKristian Hoegsberg <krh@redhat.com>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 95ffc5e3

drivers/firewire/fw-sbp2.c

+4 −4
Original line number Diff line number Diff line
@@ -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)