From f99090300b350facc5e7d8feb5f72767e0547055 Mon Sep 17 00:00:00 2001 From: James Bottomley <[mailto:James.Bottomley@SteelEye.com]> Date: Wed, 16 May 2007 10:06:39 -0400 Subject: [PATCH] --- yaml --- r: 57030 b: refs/heads/master c: cab537d609fb718e9fb09d73e3e3e3062db25743 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/aacraid/aachba.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8ac80b612178..5c366c2db5a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ab01efd1d2a24db53b4c5d28a2e20cf2b1206c5 +refs/heads/master: cab537d609fb718e9fb09d73e3e3e3062db25743 diff --git a/trunk/drivers/scsi/aacraid/aachba.c b/trunk/drivers/scsi/aacraid/aachba.c index 1e82c69b36b0..6c4319c98fee 100644 --- a/trunk/drivers/scsi/aacraid/aachba.c +++ b/trunk/drivers/scsi/aacraid/aachba.c @@ -340,7 +340,7 @@ int aac_get_containers(struct aac_dev *dev) static void aac_internal_transfer(struct scsi_cmnd *scsicmd, void *data, unsigned int offset, unsigned int len) { void *buf; - unsigned int transfer_len; + int transfer_len; struct scatterlist *sg = scsicmd->request_buffer; if (scsicmd->use_sg) { @@ -351,7 +351,7 @@ static void aac_internal_transfer(struct scsi_cmnd *scsicmd, void *data, unsigne transfer_len = min(scsicmd->request_bufflen, len + offset); } transfer_len -= offset; - if (buf && transfer_len) + if (buf && transfer_len > 0) memcpy(buf + offset, data, transfer_len); if (scsicmd->use_sg)