From 82e29230cdde8b0a95189869ed0ba22237d17000 Mon Sep 17 00:00:00 2001
From: Devendra Naga <devendra.aaru@gmail.com>
Date: Wed, 5 Sep 2012 15:33:47 +0530
Subject: [PATCH] --- yaml --- r: 324815 b: refs/heads/master c:
 b8131fc0e1c37563c278743e6def971be993cdda h: refs/heads/master i:   324813:
 8fc75c28d65f33156a3e3f96f366b51229ffcfbb   324811:
 21e65e55c3384c36b28b9f1f0f89078f1317c90b   324807:
 974114e47068a3ca6953ea5ae6641f612df99ee6   324799:
 d3a6042e450bf385cc56bc86e6e93a9a72fe6e92 v: v3

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

diff --git a/[refs] b/[refs]
index 03a35441853c..4ed69a1a275f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f6f4c17bb9a1c45355254247d164fc3e2a1289b
+refs/heads/master: b8131fc0e1c37563c278743e6def971be993cdda
diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c
index 0755bc14229c..cd920dad85cd 100644
--- a/trunk/drivers/staging/slicoss/slicoss.c
+++ b/trunk/drivers/staging/slicoss/slicoss.c
@@ -3701,9 +3701,8 @@ static void slic_init_adapter(struct net_device *netdev,
 					phys_shmem);
 	ASSERT(adapter->pshmem);
 
-	memset(adapter->pshmem, 0, sizeof(struct slic_shmem));
-
-	return;
+	if (adapter->pshmem)
+		memset(adapter->pshmem, 0, sizeof(struct slic_shmem));
 }
 
 static const struct net_device_ops slic_netdev_ops = {