diff options
| author | Christoph Hellwig <hch@lst.de> | 2006-06-03 13:21:13 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-06 11:07:25 -0400 |
| commit | 5d5ff44fe6775ccb922fd1f7d478b2ba9ca95068 (patch) | |
| tree | d8569caefe1cb5ecced30929ef98d3e1fe642425 /drivers/usb/image | |
| parent | e4a082c7c1f9a7b11fece6918e7ee5519b39ac46 (diff) | |
| download | kernel_samsung_smdk4412-5d5ff44fe6775ccb922fd1f7d478b2ba9ca95068.zip kernel_samsung_smdk4412-5d5ff44fe6775ccb922fd1f7d478b2ba9ca95068.tar.gz kernel_samsung_smdk4412-5d5ff44fe6775ccb922fd1f7d478b2ba9ca95068.tar.bz2 | |
[SCSI] fix up request buffer reference in various scsi drivers
Various scsi drivers use scsi_cmnd.buffer and scsi_cmnd.bufflen in their
queuecommand functions. Those fields are internal storage for the
midlayer only and are used to restore the original payload after
request_buffer and request_bufflen have been overwritten for EH. Using
the buffer and bufflen fields means they do very broken things in error
handling.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/usb/image')
| -rw-r--r-- | drivers/usb/image/microtek.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c index 2a0e18a..b2bafc3 100644 --- a/drivers/usb/image/microtek.c +++ b/drivers/usb/image/microtek.c @@ -513,7 +513,7 @@ static void mts_do_sg (struct urb* transfer, struct pt_regs *regs) mts_transfer_cleanup(transfer); } - sg = context->srb->buffer; + sg = context->srb->request_buffer; context->fragment++; mts_int_submit_urb(transfer, context->data_pipe, @@ -549,19 +549,19 @@ mts_build_transfer_context( Scsi_Cmnd *srb, struct mts_desc* desc ) desc->context.fragment = 0; if (!srb->use_sg) { - if ( !srb->bufflen ){ + if ( !srb->request_bufflen ){ desc->context.data = NULL; desc->context.data_length = 0; return; } else { - desc->context.data = srb->buffer; - desc->context.data_length = srb->bufflen; + desc->context.data = srb->request_buffer; + desc->context.data_length = srb->request_bufflen; MTS_DEBUG("length = %d or %d\n", srb->request_bufflen, srb->bufflen); } } else { MTS_DEBUG("Using scatter/gather\n"); - sg = srb->buffer; + sg = srb->request_buffer; desc->context.data = page_address(sg[0].page) + sg[0].offset; desc->context.data_length = sg[0].length; } |