From 4f84390fd1f143061766eee08f1127618f9cdf66 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 20 Jul 2007 16:03:40 +0100
Subject: [PATCH] --- yaml --- r: 61919 b: refs/heads/master c:
 a9204879b4242c2bed3a172399906acd371a8081 h: refs/heads/master i:   61917:
 e25fc972a000a0edc70788e2a0e8bb28ecfd3928   61915:
 b2f70c22074a00d46c78414b0da36d3f9a46aefd   61911:
 0ae4fdb9a66863d5ce7c9b7f0602ecd0cb11d3c2   61903:
 482f543d0845639f589ae09542d06b21d5a4a082   61887:
 cd0289944d327dead328e71e381598ab0f472498 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/scsi/iscsi_tcp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ec1b97a47ac1..a19c877da9aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfedfaf55a452637d72bfc482c80f902a470ebb7
+refs/heads/master: a9204879b4242c2bed3a172399906acd371a8081
diff --git a/trunk/drivers/scsi/iscsi_tcp.c b/trunk/drivers/scsi/iscsi_tcp.c
index aebcd5fcdc55..7829ab1e2fb4 100644
--- a/trunk/drivers/scsi/iscsi_tcp.c
+++ b/trunk/drivers/scsi/iscsi_tcp.c
@@ -1885,7 +1885,7 @@ static int iscsi_tcp_get_addr(struct iscsi_conn *conn, struct socket *sock,
 	struct sockaddr_in *sin;
 	int rc = 0, len;
 
-	addr = kmalloc(GFP_KERNEL, sizeof(*addr));
+	addr = kmalloc(sizeof(*addr), GFP_KERNEL);
 	if (!addr)
 		return -ENOMEM;