diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 14:36:25 +0100 | 
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 14:36:25 +0100 | 
| commit | a8931ef380c92d121ae74ecfb03b2d63f72eea6f (patch) | |
| tree | 980fb6b019e11e6cb1ece55b7faff184721a8053 /drivers/scsi/53c700.c | |
| parent | 90574d0a4d4b73308ae54a2a57a4f3f1fa98e984 (diff) | |
| parent | e5a5816f7875207cb0a0a7032e39a4686c5e10a4 (diff) | |
| download | olio-linux-3.10-a8931ef380c92d121ae74ecfb03b2d63f72eea6f.tar.xz olio-linux-3.10-a8931ef380c92d121ae74ecfb03b2d63f72eea6f.zip  | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/scsi/53c700.c')
| -rw-r--r-- | drivers/scsi/53c700.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c index f4c4fe90240..f5a9addb705 100644 --- a/drivers/scsi/53c700.c +++ b/drivers/scsi/53c700.c @@ -599,7 +599,7 @@ NCR_700_scsi_done(struct NCR_700_Host_Parameters *hostdata,  			(struct NCR_700_command_slot *)SCp->host_scribble;  		dma_unmap_single(hostdata->dev, slot->pCmd, -				 sizeof(SCp->cmnd), DMA_TO_DEVICE); +				 MAX_COMMAND_SIZE, DMA_TO_DEVICE);  		if (slot->flags == NCR_700_FLAG_AUTOSENSE) {  			char *cmnd = NCR_700_get_sense_cmnd(SCp->device);  #ifdef NCR_700_DEBUG @@ -1004,7 +1004,7 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct scsi_cmnd *SCp,  				 * here */  				NCR_700_unmap(hostdata, SCp, slot);  				dma_unmap_single(hostdata->dev, slot->pCmd, -						 sizeof(SCp->cmnd), +						 MAX_COMMAND_SIZE,  						 DMA_TO_DEVICE);  				cmnd[0] = REQUEST_SENSE; @@ -1901,7 +1901,7 @@ NCR_700_queuecommand(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *))  	}  	slot->resume_offset = 0;  	slot->pCmd = dma_map_single(hostdata->dev, SCp->cmnd, -				    sizeof(SCp->cmnd), DMA_TO_DEVICE); +				    MAX_COMMAND_SIZE, DMA_TO_DEVICE);  	NCR_700_start_command(SCp);  	return 0;  }  |