From: Brian King <brking@us.ibm.com>
Date: Tue, 14 Feb 2006 18:42:24 +0000 (-0600)
Subject: [SCSI] sg: Remove aha1542 hack
X-Git-Tag: v2.6.16-rc6~139^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eca7be5e1899626db01ae42b0123458d6fb34930;p=platform%2Fkernel%2Flinux-3.10.git

[SCSI] sg: Remove aha1542 hack

Remove a hack in the sg driver that alters the total buffer
length for SG_IO commands to ensure buffers are not odd byte
lengths. This breaks on the ipr driver since it requires the
request_bufflen to equal the length specified in the cdb.
The block layer SG_IO code does not appear to have this hack.

Signed-off-by: Douglas Gilbert <dougg@torque.net>
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 2a54753..5a0a193 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -2162,7 +2162,7 @@ sg_link_reserve(Sg_fd * sfp, Sg_request * srp, int size)
 
 	srp->res_used = 1;
 	SCSI_LOG_TIMEOUT(4, printk("sg_link_reserve: size=%d\n", size));
-	rem = size = (size + 1) & (~1);	/* round to even for aha1542 */
+	rem = size;
 
 	for (k = 0; k < rsv_schp->k_use_sg; ++k, ++sg) {
 		num = sg->length;