Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 291789
b: refs/heads/master
c: 237f259
h: refs/heads/master
i:
  291787: c6f0c4d
v: v3
  • Loading branch information
Cong Wang authored and Cong Wang committed Mar 20, 2012
1 parent 47c855f commit 40ab24c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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: cfd8005c99c68882e962807d36603791adddfb9f
refs/heads/master: 237f259ce293d95efe9ccd2bb36b7df25894eb50
10 changes: 5 additions & 5 deletions trunk/drivers/crypto/hifn_795x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1731,9 +1731,9 @@ static int ablkcipher_get(void *saddr, unsigned int *srestp, unsigned int offset
while (size) {
copy = min3(srest, dst->length, size);

daddr = kmap_atomic(sg_page(dst), KM_IRQ0);
daddr = kmap_atomic(sg_page(dst));
memcpy(daddr + dst->offset + offset, saddr, copy);
kunmap_atomic(daddr, KM_IRQ0);
kunmap_atomic(daddr);

nbytes -= copy;
size -= copy;
Expand Down Expand Up @@ -1793,17 +1793,17 @@ static void hifn_process_ready(struct ablkcipher_request *req, int error)
continue;
}

saddr = kmap_atomic(sg_page(t), KM_SOFTIRQ0);
saddr = kmap_atomic(sg_page(t));

err = ablkcipher_get(saddr, &t->length, t->offset,
dst, nbytes, &nbytes);
if (err < 0) {
kunmap_atomic(saddr, KM_SOFTIRQ0);
kunmap_atomic(saddr);
break;
}

idx += err;
kunmap_atomic(saddr, KM_SOFTIRQ0);
kunmap_atomic(saddr);
}

hifn_cipher_walk_exit(&rctx->walk);
Expand Down

0 comments on commit 40ab24c

Please sign in to comment.