diff options
Diffstat (limited to 'drivers/uwb')
| -rw-r--r-- | drivers/uwb/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/uwb/reset.c | 1 | ||||
| -rw-r--r-- | drivers/uwb/umc-bus.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/uwb/Kconfig b/drivers/uwb/Kconfig index d100f54ed65..2431eedbe6a 100644 --- a/drivers/uwb/Kconfig +++ b/drivers/uwb/Kconfig @@ -3,8 +3,7 @@ # menuconfig UWB - tristate "Ultra Wideband devices (EXPERIMENTAL)" - depends on EXPERIMENTAL + tristate "Ultra Wideband devices" depends on PCI default n help diff --git a/drivers/uwb/reset.c b/drivers/uwb/reset.c index 703228559e8..8b47c9cdd64 100644 --- a/drivers/uwb/reset.c +++ b/drivers/uwb/reset.c @@ -97,6 +97,7 @@ int uwb_rc_cmd_async(struct uwb_rc *rc, const char *cmd_name, neh = uwb_rc_neh_add(rc, cmd, expected_type, expected_event, cb, arg); if (IS_ERR(neh)) { result = PTR_ERR(neh); + uwb_dev_unlock(&rc->uwb_dev); goto out; } diff --git a/drivers/uwb/umc-bus.c b/drivers/uwb/umc-bus.c index 82a84d53120..5c5b3fc9088 100644 --- a/drivers/uwb/umc-bus.c +++ b/drivers/uwb/umc-bus.c @@ -63,7 +63,7 @@ int umc_controller_reset(struct umc_dev *umc) struct device *parent = umc->dev.parent; int ret = 0; - if (device_trylock(parent)) + if (!device_trylock(parent)) return -EAGAIN; ret = device_for_each_child(parent, parent, umc_bus_pre_reset_helper); if (ret >= 0) |