net: Print the module name as part of the watchdog message

[linux-2.6-omap-h63xx.git] / drivers / w1 / w1_netlink.c

diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c
index d539e09aad375b66f99865cdca026a93309e07cd..65c5ebd0787e0ea4840ab73db3af612443d3d7b2 100644 (file)
--- a/drivers/w1/w1_netlink.c
+++ b/drivers/w1/w1_netlink.c
@@ -171,7 +171,7 @@ static void w1_cn_callback(void *data)
                        goto out_cont;
                }
 
-               down(&dev->mutex);
+               mutex_lock(&dev->mutex);
 
                if (sl && w1_reset_select_slave(sl)) {
                        err = -ENODEV;
@@ -198,7 +198,7 @@ out_up:
                atomic_dec(&dev->refcnt);
                if (sl)
                        atomic_dec(&sl->refcnt);
-               up(&dev->mutex);
+               mutex_unlock(&dev->mutex);
 out_cont:
                msg->len -= sizeof(struct w1_netlink_msg) + m->len;
                m = (struct w1_netlink_msg *)(((u8 *)m) + sizeof(struct w1_netlink_msg) + m->len);