Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / drivers / uwb / umc-bus.c

diff --git a/drivers/uwb/umc-bus.c b/drivers/uwb/umc-bus.c
index cdd6c8efc9f8ccadef82a989f2269ffd17f01151..5fad4e791b3ed348da0ae2b93ab4b4cd8e2f16b3 100644 (file)
--- a/drivers/uwb/umc-bus.c
+++ b/drivers/uwb/umc-bus.c
@@ -62,12 +62,12 @@ int umc_controller_reset(struct umc_dev *umc)
        struct device *parent = umc->dev.parent;
        int ret = 0;
 
-       if(down_trylock(&parent->sem))
+       if (device_trylock(parent))
                return -EAGAIN;
        ret = device_for_each_child(parent, parent, umc_bus_pre_reset_helper);
        if (ret >= 0)
                ret = device_for_each_child(parent, parent, umc_bus_post_reset_helper);
-       up(&parent->sem);
+       device_unlock(parent);
 
        return ret;
 }