diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-01 13:22:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-01 13:22:04 -0500 |
| commit | 71efa38c0eef581c69c221ceb8645f61d1e93270 (patch) | |
| tree | 456c1894e26fb3aa362fc8e1fd8382160dfcb344 /drivers/scsi/sg.c | |
| parent | 96789ac4b3943fec27fb6bf2713633b01a3903ad (diff) | |
| parent | e2482fa16e9eef88344a4dca1a390d29432d4add (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Diffstat (limited to 'drivers/scsi/sg.c')
| -rw-r--r-- | drivers/scsi/sg.c | 2 |
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) | |||
| 2162 | 2162 | ||
| 2163 | srp->res_used = 1; | 2163 | srp->res_used = 1; |
| 2164 | SCSI_LOG_TIMEOUT(4, printk("sg_link_reserve: size=%d\n", size)); | 2164 | SCSI_LOG_TIMEOUT(4, printk("sg_link_reserve: size=%d\n", size)); |
| 2165 | rem = size = (size + 1) & (~1); /* round to even for aha1542 */ | 2165 | rem = size; |
| 2166 | 2166 | ||
| 2167 | for (k = 0; k < rsv_schp->k_use_sg; ++k, ++sg) { | 2167 | for (k = 0; k < rsv_schp->k_use_sg; ++k, ++sg) { |
| 2168 | num = sg->length; | 2168 | num = sg->length; |