diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-25 20:19:08 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-25 20:19:08 -0500 |
commit | 9b73e76f3cf63379dcf45fcd4f112f5812418d0a (patch) | |
tree | 4e6bef87cd0cd6d848fc39a5ae25b981dbbe035b /drivers/scsi/imm.c | |
parent | 50d9a126240f9961cfdd063336bbeb91f77a7dce (diff) | |
parent | 23c3e290fb9ce38cabc2822b47583fc8702411bf (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (200 commits)
[SCSI] usbstorage: use last_sector_bug flag universally
[SCSI] libsas: abstract STP task status into a function
[SCSI] ultrastor: clean up inline asm warnings
[SCSI] aic7xxx: fix firmware build
[SCSI] aacraid: fib context lock for management ioctls
[SCSI] ch: remove forward declarations
[SCSI] ch: fix device minor number management bug
[SCSI] ch: handle class_device_create failure properly
[SCSI] NCR5380: fix section mismatch
[SCSI] sg: fix /proc/scsi/sg/devices when no SCSI devices
[SCSI] IB/iSER: add logical unit reset support
[SCSI] don't use __GFP_DMA for sense buffers if not required
[SCSI] use dynamically allocated sense buffer
[SCSI] scsi.h: add macro for enclosure bit of inquiry data
[SCSI] sd: add fix for devices with last sector access problems
[SCSI] fix pcmcia compile problem
[SCSI] aacraid: add Voodoo Lite class of cards.
[SCSI] aacraid: add new driver features flags
[SCSI] qla2xxx: Update version number to 8.02.00-k7.
[SCSI] qla2xxx: Issue correct MBC_INITIALIZE_FIRMWARE command.
...
Diffstat (limited to 'drivers/scsi/imm.c')
-rw-r--r-- | drivers/scsi/imm.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c index a3d0c6b14958..f97d172844be 100644 --- a/drivers/scsi/imm.c +++ b/drivers/scsi/imm.c | |||
@@ -837,19 +837,16 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd) | |||
837 | 837 | ||
838 | /* Phase 4 - Setup scatter/gather buffers */ | 838 | /* Phase 4 - Setup scatter/gather buffers */ |
839 | case 4: | 839 | case 4: |
840 | if (cmd->use_sg) { | 840 | if (scsi_bufflen(cmd)) { |
841 | /* if many buffers are available, start filling the first */ | 841 | cmd->SCp.buffer = scsi_sglist(cmd); |
842 | cmd->SCp.buffer = | ||
843 | (struct scatterlist *) cmd->request_buffer; | ||
844 | cmd->SCp.this_residual = cmd->SCp.buffer->length; | 842 | cmd->SCp.this_residual = cmd->SCp.buffer->length; |
845 | cmd->SCp.ptr = sg_virt(cmd->SCp.buffer); | 843 | cmd->SCp.ptr = sg_virt(cmd->SCp.buffer); |
846 | } else { | 844 | } else { |
847 | /* else fill the only available buffer */ | ||
848 | cmd->SCp.buffer = NULL; | 845 | cmd->SCp.buffer = NULL; |
849 | cmd->SCp.this_residual = cmd->request_bufflen; | 846 | cmd->SCp.this_residual = 0; |
850 | cmd->SCp.ptr = cmd->request_buffer; | 847 | cmd->SCp.ptr = NULL; |
851 | } | 848 | } |
852 | cmd->SCp.buffers_residual = cmd->use_sg - 1; | 849 | cmd->SCp.buffers_residual = scsi_sg_count(cmd) - 1; |
853 | cmd->SCp.phase++; | 850 | cmd->SCp.phase++; |
854 | if (cmd->SCp.this_residual & 0x01) | 851 | if (cmd->SCp.this_residual & 0x01) |
855 | cmd->SCp.this_residual++; | 852 | cmd->SCp.this_residual++; |