From 416c5a291da9e5eed87e7a357a086785a9688b2a Mon Sep 17 00:00:00 2001
From: Boaz Harrosh <bharrosh@panasas.com>
Date: Sun, 9 Sep 2007 21:14:41 +0300
Subject: [PATCH] --- yaml --- r: 76992 b: refs/heads/master c:
 53d2a885032411b471b393d065c7b4693fbaafb4 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/scsi/in2000.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 3832dcaf4da2..263f824ed665 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfb104ff5d8215e09892aad3cd094ad6597b1cfe
+refs/heads/master: 53d2a885032411b471b393d065c7b4693fbaafb4
diff --git a/trunk/drivers/scsi/in2000.c b/trunk/drivers/scsi/in2000.c
index c8b452f2878c..8053b1e86ccb 100644
--- a/trunk/drivers/scsi/in2000.c
+++ b/trunk/drivers/scsi/in2000.c
@@ -369,16 +369,16 @@ static int in2000_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))
  *  - SCp.phase records this command's SRCID_ER bit setting
  */
 
-	if (cmd->use_sg) {
-		cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer;
-		cmd->SCp.buffers_residual = cmd->use_sg - 1;
+	if (scsi_bufflen(cmd)) {
+		cmd->SCp.buffer = scsi_sglist(cmd);
+		cmd->SCp.buffers_residual = scsi_sg_count(cmd) - 1;
 		cmd->SCp.ptr = sg_virt(cmd->SCp.buffer);
 		cmd->SCp.this_residual = cmd->SCp.buffer->length;
 	} else {
 		cmd->SCp.buffer = NULL;
 		cmd->SCp.buffers_residual = 0;
-		cmd->SCp.ptr = (char *) cmd->request_buffer;
-		cmd->SCp.this_residual = cmd->request_bufflen;
+		cmd->SCp.ptr = NULL;
+		cmd->SCp.this_residual = 0;
 	}
 	cmd->SCp.have_data_in = 0;