From 0f002082b33c7bb45fa3bfd24c297b6c3740c779 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 9 Dec 2009 19:52:19 +0100 Subject: [PATCH] --- yaml --- r: 181395 b: refs/heads/master c: 78d85019ba8c13e1094cad0ea9bb4f61caad8320 h: refs/heads/master i: 181393: 3b9f7cc2715a52655e4f29e17ba14ef4c94dd882 181391: cc6cb365f7a6876a3416ca147dc0e32ee12de800 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libsrp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 02d978abe3d3..328e690d3c66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22963a37b3437a25812cc856afa5a84ad4a3f541 +refs/heads/master: 78d85019ba8c13e1094cad0ea9bb4f61caad8320 diff --git a/trunk/drivers/scsi/libsrp.c b/trunk/drivers/scsi/libsrp.c index f79602f28ba7..22775165bf6a 100644 --- a/trunk/drivers/scsi/libsrp.c +++ b/trunk/drivers/scsi/libsrp.c @@ -328,7 +328,7 @@ int srp_transfer_data(struct scsi_cmnd *sc, struct srp_cmd *cmd, int offset, err = 0; u8 format; - offset = cmd->add_cdb_len * 4; + offset = cmd->add_cdb_len & ~3; dir = srp_cmd_direction(cmd); if (dir == DMA_FROM_DEVICE) @@ -366,7 +366,7 @@ static int vscsis_data_length(struct srp_cmd *cmd, enum dma_data_direction dir) { struct srp_direct_buf *md; struct srp_indirect_buf *id; - int len = 0, offset = cmd->add_cdb_len * 4; + int len = 0, offset = cmd->add_cdb_len & ~3; u8 fmt; if (dir == DMA_TO_DEVICE)