Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 57030
b: refs/heads/master
c: cab537d
h: refs/heads/master
v: v3
  • Loading branch information
James Bottomley authored and James Bottomley committed May 16, 2007
1 parent b063f75 commit f990903
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2ab01efd1d2a24db53b4c5d28a2e20cf2b1206c5
refs/heads/master: cab537d609fb718e9fb09d73e3e3e3062db25743
4 changes: 2 additions & 2 deletions trunk/drivers/scsi/aacraid/aachba.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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)
Expand Down

0 comments on commit f990903

Please sign in to comment.