X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fscsi%2F3w-9xxx.c;h=76c09097175f131ff9a60b77089a31f8d1932008;hb=38e2f035587b0674b3168931c8402f4d719fdd76;hp=113aaed490d413219ee593b78bbb1236f6289a2d;hpb=0debe01d3e26bb692c36c575514a124c29669cdd;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 113aaed..76c0909 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -1902,17 +1902,11 @@ out:
 static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int request_id)
 {
 	struct scsi_cmnd *cmd = tw_dev->srb[request_id];
-	int use_sg = scsi_sg_count(cmd);
 
 	if (scsi_bufflen(cmd) < TW_MIN_SGL_LENGTH &&
 	    (cmd->sc_data_direction == DMA_FROM_DEVICE ||
 	     cmd->sc_data_direction == DMA_BIDIRECTIONAL)) {
-		if (!use_sg)
-			memcpy(scsi_sglist(cmd),
-			       tw_dev->generic_buffer_virt[request_id],
-			       scsi_bufflen(cmd));
-
-		if (use_sg == 1) {
+		if (scsi_sg_count(cmd) == 1) {
 			struct scatterlist *sg = scsi_sglist(tw_dev->srb[request_id]);
 			char *buf;
 			unsigned long flags = 0;