Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eca7be5e authored by Brian King's avatar Brian King Committed by James Bottomley
Browse files

[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: default avatarDouglas Gilbert <dougg@torque.net>
Signed-off-by: default avatarBrian King <brking@us.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent b9a33ceb

drivers/scsi/sg.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2162,7 +2162,7 @@ sg_link_reserve(Sg_fd * sfp, Sg_request * srp, int size) 




	srp->res_used = 1;

	srp->res_used = 1;

	SCSI_LOG_TIMEOUT(4, printk("sg_link_reserve: size=%d\n", size));

	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) {

	for (k = 0; k < rsv_schp->k_use_sg; ++k, ++sg) {

		num = sg->length;

		num = sg->length;