[SG] Update drivers to use sg helpers

[sfrench/cifs-2.6.git] / drivers / usb / image / microtek.c

diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index e7d982a71548d819e08272a93eb9788defa14f48..91e999c9f680cec92aed6c38fa58698820d3754e 100644 (file)
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -519,8 +519,7 @@ static void mts_do_sg (struct urb* transfer)
        context->fragment++;
        mts_int_submit_urb(transfer,
                           context->data_pipe,
-                          page_address(sg[context->fragment].page) +
-                          sg[context->fragment].offset,
+                          sg_virt(&sg[context->fragment]),
                           sg[context->fragment].length,
                           context->fragment + 1 == scsi_sg_count(context->srb) ?
                           mts_data_done : mts_do_sg);
@@ -557,7 +556,7 @@ mts_build_transfer_context(struct scsi_cmnd *srb, struct mts_desc* desc)
                return;
        } else {
                sg = scsi_sglist(srb);
-               desc->context.data = page_address(sg[0].page) + sg[0].offset;
+               desc->context.data = sg_virt(&sg[0]);
                desc->context.data_length = sg[0].length;
        }