aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/megaraid.c
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic.(none)>2005-12-15 18:35:24 -0500
committerJames Bottomley <jejb@titanic.(none)>2005-12-15 18:35:24 -0500
commit2a1e1379bae53f647c463a677cc2ec71b591c348 (patch)
treea152beb5e8679e94430c5b47bf798dd8a2d4fd5d /drivers/scsi/megaraid.c
parent787926b1b2d21d42ca462dc736b77f1a4a30c503 (diff)
parent7b6666530e2736f190a2629c8abe34275054449f (diff)
Merge by hand (conflicts in scsi_lib.c)
This merge is pretty extensive. The conflict is over the new req->retries parameter, so I had to change the prototype to scsi_setup_blk_pc_cmnd() and the usage in sd, sr and st. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/megaraid.c')
-rw-r--r--drivers/scsi/megaraid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 9fa41ccadef2..4a6feb1e5e3d 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -665,7 +665,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy)
665 sg->offset; 665 sg->offset;
666 } else 666 } else
667 buf = cmd->request_buffer; 667 buf = cmd->request_buffer;
668 memset(cmd->request_buffer, 0, cmd->cmnd[4]); 668 memset(buf, 0, cmd->cmnd[4]);
669 if (cmd->use_sg) { 669 if (cmd->use_sg) {
670 struct scatterlist *sg; 670 struct scatterlist *sg;
671 671