Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 247791
b: refs/heads/master
c: de2954d
h: refs/heads/master
i:
  247789: 9470002
  247787: 2db45fa
  247783: 60ece73
  247775: 12e78ec
v: v3
  • Loading branch information
Kim Phillips authored and Herbert Xu committed May 4, 2011
1 parent 4a0002b commit 975fb42
Show file tree
Hide file tree
Showing 3 changed files with 5 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: 701af31ce0cc6a1114001d792c21108c7f49ac86
refs/heads/master: de2954d66408da3ae34effda777bb564fd17781b
6 changes: 3 additions & 3 deletions trunk/drivers/crypto/caam/caamalg.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ static void split_key_done(struct device *dev, u32 *desc, u32 err,
dev_err(dev, "%s %d: err 0x%x\n", __func__, __LINE__, err);
#endif
if (err) {
char tmp[256];
char tmp[CAAM_ERROR_STR_MAX];

dev_err(dev, "%08x: %s\n", err, caam_jr_strstatus(tmp, err));
}
Expand Down Expand Up @@ -414,7 +414,7 @@ static void ipsec_esp_encrypt_done(struct device *jrdev, u32 *desc, u32 err,
offsetof(struct ipsec_esp_edesc, hw_desc));

if (err) {
char tmp[256];
char tmp[CAAM_ERROR_STR_MAX];

dev_err(jrdev, "%08x: %s\n", err, caam_jr_strstatus(tmp, err));
}
Expand Down Expand Up @@ -454,7 +454,7 @@ static void ipsec_esp_decrypt_done(struct device *jrdev, u32 *desc, u32 err,
offsetof(struct ipsec_esp_edesc, hw_desc));

if (err) {
char tmp[256];
char tmp[CAAM_ERROR_STR_MAX];

dev_err(jrdev, "%08x: %s\n", err, caam_jr_strstatus(tmp, err));
}
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/crypto/caam/error.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@

#ifndef CAAM_ERROR_H
#define CAAM_ERROR_H
#define CAAM_ERROR_STR_MAX 302
extern char *caam_jr_strstatus(char *outstr, u32 status);
#endif /* CAAM_ERROR_H */

0 comments on commit 975fb42

Please sign in to comment.