git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
usb
/
image
/
microtek.c
diff --git
a/drivers/usb/image/microtek.c
b/drivers/usb/image/microtek.c
index
b2bafc3
..
2a0e18a
100644
(file)
--- 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);
}
mts_transfer_cleanup(transfer);
}
- sg = context->srb->
request_
buffer;
+ sg = context->srb->buffer;
context->fragment++;
mts_int_submit_urb(transfer,
context->data_pipe,
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) {
desc->context.fragment = 0;
if (!srb->use_sg) {
- if ( !srb->
request_
bufflen ){
+ if ( !srb->bufflen ){
desc->context.data = NULL;
desc->context.data_length = 0;
return;
} else {
desc->context.data = NULL;
desc->context.data_length = 0;
return;
} else {
- desc->context.data = srb->
request_
buffer;
- desc->context.data_length = srb->
request_
bufflen;
+ desc->context.data = srb->buffer;
+ desc->context.data_length = srb->bufflen;
MTS_DEBUG("length = %d or %d\n",
srb->request_bufflen, srb->bufflen);
}
} else {
MTS_DEBUG("Using scatter/gather\n");
MTS_DEBUG("length = %d or %d\n",
srb->request_bufflen, srb->bufflen);
}
} else {
MTS_DEBUG("Using scatter/gather\n");
- sg = srb->
request_
buffer;
+ sg = srb->buffer;
desc->context.data = page_address(sg[0].page) + sg[0].offset;
desc->context.data_length = sg[0].length;
}
desc->context.data = page_address(sg[0].page) + sg[0].offset;
desc->context.data_length = sg[0].length;
}