---

yaml --- r: 324815 b: refs/heads/master c: b8131fc h: refs/heads/master i: 324813: 8fc75c2 324811: 21e65e5 324807: 974114e 324799: d3a6042 v: v3
git-mirror · Sep 5, 2012 · 82e2923 · 82e2923
1 parent 2ade5b6
commit 82e2923
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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 = {