---

yaml --- r: 15137 b: refs/heads/master c: a8c730e h: refs/heads/master i: 15135: 7e372e9 v: v3
git-mirror · Dec 9, 2005 · 61f7bd3 · 61f7bd3
1 parent 95db26f
commit 61f7bd3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85631672e6a8032267058b4ccbe53f1924a5d0be
+refs/heads/master: a8c730e85e80734412f4f73ab28496a0e8b04a7b
diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c
@@ -1215,12 +1215,12 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)
 		} else {
 			memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd));
 			cmd->cmd_len = req->cmd_len;
-			if (rq_data_dir(req) == WRITE)
+			if (!req->data_len)
+				cmd->sc_data_direction = DMA_NONE;
+			else if (rq_data_dir(req) == WRITE)
 				cmd->sc_data_direction = DMA_TO_DEVICE;
-			else if (req->data_len)
-				cmd->sc_data_direction = DMA_FROM_DEVICE;
 			else
-				cmd->sc_data_direction = DMA_NONE;
+				cmd->sc_data_direction = DMA_FROM_DEVICE;
 
 			cmd->transfersize = req->data_len;
 			cmd->allowed = 3;