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 = {