diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 08:07:04 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 08:07:04 -0700 |
commit | 17c0d2a1d5a562982f1f2177b8270fbfaa42508c (patch) | |
tree | e24110f55f9eb3440abb5511aa5ba970d7c946fe | |
parent | 3c1370a3f6ba8e4813269ddbf950d59f997338bc (diff) | |
parent | 7e6cfb54b1ff4b64d74aa8cd191204c9598c073d (diff) |
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
-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 4a1cf6377f6..90535089672 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; |