diff options
author | Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 2006-04-03 04:04:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-22 14:22:50 -0400 |
commit | abd52a13206e02537ca1dc08fc5438c7d27bdbf1 (patch) | |
tree | efe0ff89898aad10600d392ac727dcea9e7af322 /drivers/w1/w1_netlink.c | |
parent | 46e07f6e5eb0e465e086b8f485f4238bd453e3e9 (diff) |
[PATCH] w1: Use mutexes instead of semaphores.
Use mutexes instead of semaphores.
Patch tested on x86_64 and i386 with test bus master driver.
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/w1/w1_netlink.c')
-rw-r--r-- | drivers/w1/w1_netlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c index d539e09aad37..65c5ebd0787e 100644 --- a/drivers/w1/w1_netlink.c +++ b/drivers/w1/w1_netlink.c | |||
@@ -171,7 +171,7 @@ static void w1_cn_callback(void *data) | |||
171 | goto out_cont; | 171 | goto out_cont; |
172 | } | 172 | } |
173 | 173 | ||
174 | down(&dev->mutex); | 174 | mutex_lock(&dev->mutex); |
175 | 175 | ||
176 | if (sl && w1_reset_select_slave(sl)) { | 176 | if (sl && w1_reset_select_slave(sl)) { |
177 | err = -ENODEV; | 177 | err = -ENODEV; |
@@ -198,7 +198,7 @@ out_up: | |||
198 | atomic_dec(&dev->refcnt); | 198 | atomic_dec(&dev->refcnt); |
199 | if (sl) | 199 | if (sl) |
200 | atomic_dec(&sl->refcnt); | 200 | atomic_dec(&sl->refcnt); |
201 | up(&dev->mutex); | 201 | mutex_unlock(&dev->mutex); |
202 | out_cont: | 202 | out_cont: |
203 | msg->len -= sizeof(struct w1_netlink_msg) + m->len; | 203 | msg->len -= sizeof(struct w1_netlink_msg) + m->len; |
204 | m = (struct w1_netlink_msg *)(((u8 *)m) + sizeof(struct w1_netlink_msg) + m->len); | 204 | m = (struct w1_netlink_msg *)(((u8 *)m) + sizeof(struct w1_netlink_msg) + m->len); |