Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363766
b: refs/heads/master
c: 1cedfa3
h: refs/heads/master
v: v3
  • Loading branch information
Masanari Iida authored and Greg Kroah-Hartman committed Mar 28, 2013
1 parent d1eebf7 commit 8b04f91
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 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: b26c05a207de3a2f84f1e084ad47a55a2d8e6fb0
refs/heads/master: 1cedfa317eb15a82b4e44ed868f4e451238d5aea
4 changes: 2 additions & 2 deletions trunk/drivers/staging/sep/sep_crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -1206,7 +1206,7 @@ static int sep_crypto_block_data(struct ablkcipher_request *req)

if (copy_result != crypto_ablkcipher_blocksize(tfm)) {
dev_warn(&ta_ctx->sep_used->pdev->dev,
"des block copy faild\n");
"des block copy failed\n");
return -ENOMEM;
}

Expand Down Expand Up @@ -1637,7 +1637,7 @@ static u32 crypto_post_op(struct sep_device *sep)
crypto_ablkcipher_blocksize(tfm)) {

dev_warn(&ta_ctx->sep_used->pdev->dev,
"des block copy faild\n");
"des block copy failed\n");
sep_crypto_release(sctx, ta_ctx,
-ENOMEM);
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/sep/sep_driver_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ held by the process (struct file) */
/* maximum number of entries in the caller id table */
#define SEP_CALLER_ID_TABLE_NUM_ENTRIES 20

/* maximum number of symetric operation (that require DMA resource)
/* maximum number of symmetric operation (that require DMA resource)
per one message */
#define SEP_MAX_NUM_SYNC_DMA_OPS 16

Expand Down

0 comments on commit 8b04f91

Please sign in to comment.