From c6d4c89354ee7656140b854b88397c06d55cd678 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Sun, 9 Mar 2008 13:44:36 +0900 Subject: [PATCH] --- yaml --- r: 89681 b: refs/heads/master c: e943752ecf0ce41cdf949d565140d91c7711dfd9 h: refs/heads/master i: 89679: 853edade985c0032abccb271063f3fdc2a282989 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/3w-xxxx.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 50832930abc2..e1d7ffda57da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31fe47d4374eb29d914333aa26bcb7ca9f1545f3 +refs/heads/master: e943752ecf0ce41cdf949d565140d91c7711dfd9 diff --git a/trunk/drivers/scsi/3w-xxxx.c b/trunk/drivers/scsi/3w-xxxx.c index d09532162217..a2fc06022e10 100644 --- a/trunk/drivers/scsi/3w-xxxx.c +++ b/trunk/drivers/scsi/3w-xxxx.c @@ -1463,18 +1463,10 @@ static void tw_transfer_internal(TW_Device_Extension *tw_dev, int request_id, void *data, unsigned int len) { struct scsi_cmnd *cmd = tw_dev->srb[request_id]; - void *buf; - unsigned int transfer_len; - unsigned long flags = 0; - struct scatterlist *sg = scsi_sglist(cmd); + unsigned long flags; local_irq_save(flags); - buf = kmap_atomic(sg_page(sg), KM_IRQ0) + sg->offset; - transfer_len = min(sg->length, len); - - memcpy(buf, data, transfer_len); - - kunmap_atomic(buf - sg->offset, KM_IRQ0); + scsi_sg_copy_from_buffer(cmd, data, len); local_irq_restore(flags); }