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;