From 0b8dfb94a0879be23f294c45629670996f6d4a3c Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 13 Feb 2012 20:19:14 +0000
Subject: [PATCH] --- yaml --- r: 287695 b: refs/heads/master c:
 f65bd5ec47a4461bc575d5d34902fd18b6ec5542 h: refs/heads/master i:   287693:
 7b7ecc15ec6ee3d48bd494f42fbfb1c62d13ddc4   287691:
 d88969dba7f55906a163325009c97bfd86d92d31   287687:
 a459fbb6048bc7341ec983b57b3df521ed48a129   287679:
 0325e3ff12b4947302df24402b13038600e50642 v: v3

---
 [refs]                   | 2 +-
 trunk/net/rxrpc/ar-key.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e06ce1feb950..0a293b8f8232 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc543637525b59af38af2ce09a4dbdd7d5eb27bf
+refs/heads/master: f65bd5ec47a4461bc575d5d34902fd18b6ec5542
diff --git a/trunk/net/rxrpc/ar-key.c b/trunk/net/rxrpc/ar-key.c
index 4cba13e46ffd..ae3a035f5390 100644
--- a/trunk/net/rxrpc/ar-key.c
+++ b/trunk/net/rxrpc/ar-key.c
@@ -232,7 +232,7 @@ static int rxrpc_krb5_decode_principal(struct krb5_principal *princ,
 	if (toklen <= (n_parts + 1) * 4)
 		return -EINVAL;
 
-	princ->name_parts = kcalloc(sizeof(char *), n_parts, GFP_KERNEL);
+	princ->name_parts = kcalloc(n_parts, sizeof(char *), GFP_KERNEL);
 	if (!princ->name_parts)
 		return -ENOMEM;
 
@@ -355,7 +355,7 @@ static int rxrpc_krb5_decode_tagged_array(struct krb5_tagged_data **_td,
 
 		_debug("n_elem %d", n_elem);
 
-		td = kcalloc(sizeof(struct krb5_tagged_data), n_elem,
+		td = kcalloc(n_elem, sizeof(struct krb5_tagged_data),
 			     GFP_KERNEL);
 		if (!td)
 			return -ENOMEM;