From 10799b446dbcd73488dfede47ee998501729db3f Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Thu, 17 Nov 2011 06:32:37 +0000
Subject: [PATCH] --- yaml --- r: 277906 b: refs/heads/master c:
 f8a15af093b19b86d56933c8757cee298d0f32a8 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/net/team/team.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 08fa591c90af..8ddc849677e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bba19fff8d09bf19df5d5e2de7188d65de67c3e
+refs/heads/master: f8a15af093b19b86d56933c8757cee298d0f32a8
diff --git a/trunk/drivers/net/team/team.c b/trunk/drivers/net/team/team.c
index c48ef19cac13..064155d56bce 100644
--- a/trunk/drivers/net/team/team.c
+++ b/trunk/drivers/net/team/team.c
@@ -104,19 +104,15 @@ int team_options_register(struct team *team,
 	if (!dst_opts)
 		return -ENOMEM;
 	for (i = 0; i < option_count; i++, option++) {
-		struct team_option *dst_opt;
-
 		if (__team_find_option(team, option->name)) {
 			err = -EEXIST;
 			goto rollback;
 		}
-		dst_opt = kmalloc(sizeof(*option), GFP_KERNEL);
-		if (!dst_opt) {
+		dst_opts[i] = kmemdup(option, sizeof(*option), GFP_KERNEL);
+		if (!dst_opts[i]) {
 			err = -ENOMEM;
 			goto rollback;
 		}
-		memcpy(dst_opt, option, sizeof(*option));
-		dst_opts[i] = dst_opt;
 	}
 
 	for (i = 0; i < option_count; i++)