From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Date: Fri, 14 Oct 2005 22:59:11 +0000 (-0700)
Subject: [PATCH] Dallas's 1-wire bus compile error
X-Git-Tag: v2.6.14-rc5~49
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=2d1f87a728a5ddd9ee0418e14a12e5cb0372fad1;p=linux-2.6-omap-h63xx.git

[PATCH] Dallas's 1-wire bus compile error

drivers/built-in.o: In function `w1_alloc_dev': undefined reference to `netlink_kernel_create'
drivers/built-in.o: In function `w1_alloc_dev': undefined reference to `sock_release'

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 1b6b74c116a..14016b1cd94 100644
--- a/drivers/w1/w1.c
+++ b/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);
 }