From 975fb4242b16cf9469e27404a13ee0760e66d742 Mon Sep 17 00:00:00 2001
From: Kim Phillips <kim.phillips@freescale.com>
Date: Mon, 2 May 2011 18:29:17 -0500
Subject: [PATCH] --- yaml --- r: 247791 b: refs/heads/master c:
 de2954d66408da3ae34effda777bb564fd17781b h: refs/heads/master i:   247789:
 9470002257db06f5d1caf6ce4aa0065c5e576ac0   247787:
 2db45fab3944185d3c0ec7d606b7bd8b77b4e61f   247783:
 60ece73eb7311438cdd31fcddc970ca21ec35930   247775:
 12e78ec9ce6d5fa7821c9d6de629548161368a8f v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/crypto/caam/caamalg.c | 6 +++---
 trunk/drivers/crypto/caam/error.h   | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 21c2fde35038..3d35d5d62e96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 701af31ce0cc6a1114001d792c21108c7f49ac86
+refs/heads/master: de2954d66408da3ae34effda777bb564fd17781b
diff --git a/trunk/drivers/crypto/caam/caamalg.c b/trunk/drivers/crypto/caam/caamalg.c
index 5c16019cf306..b97575e414f6 100644
--- a/trunk/drivers/crypto/caam/caamalg.c
+++ b/trunk/drivers/crypto/caam/caamalg.c
@@ -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));
 	}
@@ -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));
 	}
@@ -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));
 	}
diff --git a/trunk/drivers/crypto/caam/error.h b/trunk/drivers/crypto/caam/error.h
index 067afc120132..02c7baa1748e 100644
--- a/trunk/drivers/crypto/caam/error.h
+++ b/trunk/drivers/crypto/caam/error.h
@@ -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 */