From c5402f30d5a4ea1f485cbf21120c57a774d8868e Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Thu, 16 Aug 2012 21:46:56 +0000
Subject: [PATCH] --- yaml --- r: 322033 b: refs/heads/master c:
 82a820e8d75f7f3fcd1af24609da79d7d89d5450 h: refs/heads/master i:   322031:
 8d524e078057be8fd44d23f93751939cded7d787 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/wimax/i2400m/fw.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a3d6c47a0dde..8c2a1673f560 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3f0db1c772ca8f08feabe9d2636dcc1103c5cb8
+refs/heads/master: 82a820e8d75f7f3fcd1af24609da79d7d89d5450
diff --git a/trunk/drivers/net/wimax/i2400m/fw.c b/trunk/drivers/net/wimax/i2400m/fw.c
index 283237f6f074..def12b38cbf7 100644
--- a/trunk/drivers/net/wimax/i2400m/fw.c
+++ b/trunk/drivers/net/wimax/i2400m/fw.c
@@ -326,8 +326,10 @@ int i2400m_barker_db_init(const char *_options)
 		unsigned barker;
 
 		options_orig = kstrdup(_options, GFP_KERNEL);
-		if (options_orig == NULL)
+		if (options_orig == NULL) {
+			result = -ENOMEM;
 			goto error_parse;
+		}
 		options = options_orig;
 
 		while ((token = strsep(&options, ",")) != NULL) {