From a70bf9c5a1d3e1e90720f26cf791f00af43a6ae4 Mon Sep 17 00:00:00 2001
From: Devendra Naga <devendra.aaru@gmail.com>
Date: Tue, 23 Oct 2012 18:04:32 -0400
Subject: [PATCH] --- yaml --- r: 337199 b: refs/heads/master c:
 0608882d01671983be20097e3ffd6be20c9a7724 h: refs/heads/master i:   337197:
 959eff1e0db73a8130b5a71518143c97961ac83b   337195:
 c7036e4991a9f1e77cbfb0b698e493a9d92237af   337191:
 a73fe6f6505e99529574d16fa8a3ca6d9f189370   337183:
 dccffef5ff615a3721685c5eda60a05606f9f070 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/slicoss/slicoss.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ed6fbc6d2b4b..b7673503c8b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fc465b106b40a598d83a0c98d0e8c2a1b4653ff
+refs/heads/master: 0608882d01671983be20097e3ffd6be20c9a7724
diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c
index 945428084914..f6af3fe46c5e 100644
--- a/trunk/drivers/staging/slicoss/slicoss.c
+++ b/trunk/drivers/staging/slicoss/slicoss.c
@@ -3667,6 +3667,8 @@ static u32 slic_card_locate(struct adapter *adapter)
 	if (!physcard) {
 		/* no structure allocated for this physical card yet */
 		physcard = kzalloc(sizeof(struct physcard), GFP_ATOMIC);
+		if (!physcard)
+			return -ENOMEM;
 
 		physcard->next = slic_global.phys_card;
 		slic_global.phys_card = physcard;