summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sg.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-04 04:22:45 +0100
committerJeff Garzik <jeff@garzik.org>2006-03-04 04:22:45 +0100
commit46153552b43675dd4057cd526331b5bd10f39c7d (patch)
tree62b6055ee61e320dc10ea81903abbe2e7553bf4e /drivers/scsi/sg.c
parent[PATCH] sb1250-mac: Add support for the BCM1480 (diff)
parentMassive net driver const-ification. (diff)
downloadlinux-46153552b43675dd4057cd526331b5bd10f39c7d.tar.xz
linux-46153552b43675dd4057cd526331b5bd10f39c7d.zip
Merge branch 'net-const'
Diffstat (limited to 'drivers/scsi/sg.c')
-rw-r--r--drivers/scsi/sg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 2a547538d444..5a0a19322d01 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;