diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 17:07:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 17:07:04 +0200 |
| commit | 17c0d2a1d5a562982f1f2177b8270fbfaa42508c (patch) | |
| tree | e24110f55f9eb3440abb5511aa5ba970d7c946fe /drivers | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | scsi: fix fall out of sg-chaining patch in qlogicpti (diff) | |
| download | linux-17c0d2a1d5a562982f1f2177b8270fbfaa42508c.tar.xz linux-17c0d2a1d5a562982f1f2177b8270fbfaa42508c.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
scsi: fix fall out of sg-chaining patch in qlogicpti
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/qlogicpti.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index 4a1cf6377f6c..905350896725 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c @@ -914,6 +914,7 @@ static inline int load_cmd(struct scsi_cmnd *Cmnd, struct Command_Entry *cmd, ds[i].d_count = sg_dma_len(s); } sg_count -= n; + sg = s; } } else { cmd->dataseg[0].d_base = 0; |