diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
| commit | b01e86fee6c821e4e003fd4e9f65453ac478a58e (patch) | |
| tree | 21695e10cbe7001d2ccc8c87cee5e7a7865b1025 /arch/ia64/hp/sim/simscsi.c | |
| parent | e889173c2c67dc288e9b050ab066cfae151b047e (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
Merge /spare/repo/linux-2.6 into upstream
Diffstat (limited to 'arch/ia64/hp/sim/simscsi.c')
| -rw-r--r-- | arch/ia64/hp/sim/simscsi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c index 8a4f0d0d17a3..8f0a16a79a67 100644 --- a/arch/ia64/hp/sim/simscsi.c +++ b/arch/ia64/hp/sim/simscsi.c | |||
| @@ -244,7 +244,8 @@ static void simscsi_fillresult(struct scsi_cmnd *sc, char *buf, unsigned len) | |||
| 244 | 244 | ||
| 245 | if (scatterlen == 0) | 245 | if (scatterlen == 0) |
| 246 | memcpy(sc->request_buffer, buf, len); | 246 | memcpy(sc->request_buffer, buf, len); |
| 247 | else for (slp = (struct scatterlist *)sc->request_buffer; scatterlen-- > 0 && len > 0; slp++) { | 247 | else for (slp = (struct scatterlist *)sc->request_buffer; |
| 248 | scatterlen-- > 0 && len > 0; slp++) { | ||
| 248 | unsigned thislen = min(len, slp->length); | 249 | unsigned thislen = min(len, slp->length); |
| 249 | 250 | ||
| 250 | memcpy(page_address(slp->page) + slp->offset, buf, thislen); | 251 | memcpy(page_address(slp->page) + slp->offset, buf, thislen); |