An explanation of the purpose of this patch is available in the patch "scsi: Introduce the scsi_status union". Cc: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx> Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx> --- drivers/firewire/sbp2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c index 4d5054211550..667ceb8a76bc 100644 --- a/drivers/firewire/sbp2.c +++ b/drivers/firewire/sbp2.c @@ -1374,7 +1374,7 @@ static void complete_command_orb(struct sbp2_orb *base_orb, sizeof(orb->request), DMA_TO_DEVICE); sbp2_unmap_scatterlist(device->card->device, orb); - orb->cmd->result = result; + orb->cmd->status.combined = result; orb->cmd->scsi_done(orb->cmd); }