diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-26 16:04:23 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-26 16:04:23 -0400 |
| commit | f834c755423332a6ff4397fae754029a6a7a8249 (patch) | |
| tree | 004266b9612a69484a5dc0dc3d6db0d1e5ab60d5 /arch | |
| parent | 62250b3bb596ffbae17c4b3d865fecd6329ce8b3 (diff) | |
| parent | 0db99e3359234be181590463184b9959059a9ea9 (diff) | |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Diffstat (limited to 'arch')
| -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); |