---

yaml --- r: 9879 b: refs/heads/master c: 2d1f87a h: refs/heads/master i: 9877: bdd8ea7 9875: 97c5290 9871: 6e68d10 v: v3
git-mirror · Oct 15, 2005 · c01435f · c01435f
1 parent dcd9572
commit c01435f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e7734d3ca24302a513e69dd24a560c34047c038
+refs/heads/master: 2d1f87a728a5ddd9ee0418e14a12e5cb0372fad1
diff --git a/trunk/drivers/w1/w1.c b/trunk/drivers/w1/w1.c
@@ -77,8 +77,7 @@ static void w1_master_release(struct device *dev)
 
 	dev_dbg(dev, "%s: Releasing %s.\n", __func__, md->name);
 
-	if (md->nls && md->nls->sk_socket)
-		sock_release(md->nls->sk_socket);
+	dev_fini_netlink(md);
 	memset(md, 0, sizeof(struct w1_master) + sizeof(struct w1_bus_master));
 	kfree(md);
 }