diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-16 14:48:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-16 14:48:01 -0500 |
| commit | d0cac32fa551b0e7dc1f014607eabb93b0ebbbe8 (patch) | |
| tree | d6abb3575e8e7026d132aa1f17a48b557bc0b9de /drivers/scsi/psi240i.c | |
| parent | 626db29f31ce253726411182ff6c15e31efe2e9a (diff) | |
| parent | 05052f7f130b1232faeee1674a5bc41f67746cff (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] psi240i.c: fix an array overrun
[SCSI] gdth: Fix && typos
[SCSI] iscsi class: update version
[SCSI] iscsi_tcp: fix xmittask oops
[SCSI] iscsi: add newlines to debug messages
[SCSI] iscsi: always release crypto
[SCSI] sg: fix incorrect last scatg length
[SCSI] 3ware 9000 add support for 9650SE
[SCSI] aic94xx SCSI timeout fix: SMP retry fix.
[SCSI] aic94xx SCSI timeout fix
Diffstat (limited to 'drivers/scsi/psi240i.c')
| -rw-r--r-- | drivers/scsi/psi240i.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/psi240i.c b/drivers/scsi/psi240i.c index ac0419e2714a..899e89d6fe67 100644 --- a/drivers/scsi/psi240i.c +++ b/drivers/scsi/psi240i.c | |||
| @@ -328,7 +328,7 @@ static void Irq_Handler (int irq, void *dev_id) | |||
| 328 | pinquiryData->AdditionalLength = 35 - 4; | 328 | pinquiryData->AdditionalLength = 35 - 4; |
| 329 | 329 | ||
| 330 | // Fill in vendor identification fields. | 330 | // Fill in vendor identification fields. |
| 331 | for ( z = 0; z < 20; z += 2 ) | 331 | for ( z = 0; z < 8; z += 2 ) |
| 332 | { | 332 | { |
| 333 | pinquiryData->VendorId[z] = ((UCHAR *)identifyData.ModelNumber)[z + 1]; | 333 | pinquiryData->VendorId[z] = ((UCHAR *)identifyData.ModelNumber)[z + 1]; |
| 334 | pinquiryData->VendorId[z + 1] = ((UCHAR *)identifyData.ModelNumber)[z]; | 334 | pinquiryData->VendorId[z + 1] = ((UCHAR *)identifyData.ModelNumber)[z]; |