From c01435f57b506c3cf79c27e9650cd468f29c0609 Mon Sep 17 00:00:00 2001
From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Date: Fri, 14 Oct 2005 15:59:11 -0700
Subject: [PATCH] --- yaml --- r: 9879 b: refs/heads/master c:
 2d1f87a728a5ddd9ee0418e14a12e5cb0372fad1 h: refs/heads/master i:   9877:
 bdd8ea7d3efaa9022acbfa131fd2437e0222f3ef   9875:
 97c5290644bd9af79ec250b02aa96249bc44fb8d   9871:
 6e68d107f0557287a37a6c7bb69a9b15213e8712 v: v3

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

diff --git a/[refs] b/[refs]
index e7f03b4235ba..53e169724e9c 100644
--- 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
index 1b6b74c116a9..14016b1cd948 100644
--- 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);
 }