Re: [PATCH] Dallas's 1-wire bus compile error (again)

[Evgeniy Polyakov <johnpol@2ka.mipt.ru>]

On Thu, Oct 13, 2005 at 09:20:21PM +0200, Christian (evil@g-house.de) wrote:
> Evgeniy Polyakov wrote:
> >
> >Hmm... Could you please provide error log.
> >Networking is only used for netlink notifications which are disabled 
> >if CONFIG_NET is not set, you can find empty declarations in
> >w1_netlink.c
> 
> Similar errors as in the mentioned thread, but here we go:
> 
> 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'
> drivers/built-in.o: In function `w1_free_dev':
> : undefined reference to `sock_release'
> make: *** [.tmp_vmlinux1] Error 1

It looks like you use old version - I've just compiled 
today's git tree with your config, and it does have an error, 
but in different place.
That bug was introduced during big w1 cleanup due to device driver
model.

Attached patch fixes that on x86_64 and i386 compilation.

Thank you, Christian.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -77,8 +77,7 @@ static void w1_master_release(struct 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);
 }


-- 
	Evgeniy Polyakov