aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/uwb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/uwb')
-rw-r--r--drivers/uwb/Kconfig3
-rw-r--r--drivers/uwb/reset.c1
-rw-r--r--drivers/uwb/umc-bus.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/uwb/Kconfig b/drivers/uwb/Kconfig
index d100f54ed650..2431eedbe6a5 100644
--- a/drivers/uwb/Kconfig
+++ b/drivers/uwb/Kconfig
@@ -3,8 +3,7 @@
3# 3#
4 4
5menuconfig UWB 5menuconfig UWB
6 tristate "Ultra Wideband devices (EXPERIMENTAL)" 6 tristate "Ultra Wideband devices"
7 depends on EXPERIMENTAL
8 depends on PCI 7 depends on PCI
9 default n 8 default n
10 help 9 help
diff --git a/drivers/uwb/reset.c b/drivers/uwb/reset.c
index 703228559e89..8b47c9cdd642 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,
97 neh = uwb_rc_neh_add(rc, cmd, expected_type, expected_event, cb, arg); 97 neh = uwb_rc_neh_add(rc, cmd, expected_type, expected_event, cb, arg);
98 if (IS_ERR(neh)) { 98 if (IS_ERR(neh)) {
99 result = PTR_ERR(neh); 99 result = PTR_ERR(neh);
100 uwb_dev_unlock(&rc->uwb_dev);
100 goto out; 101 goto out;
101 } 102 }
102 103
diff --git a/drivers/uwb/umc-bus.c b/drivers/uwb/umc-bus.c
index 82a84d53120f..5c5b3fc9088a 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)
63 struct device *parent = umc->dev.parent; 63 struct device *parent = umc->dev.parent;
64 int ret = 0; 64 int ret = 0;
65 65
66 if (device_trylock(parent)) 66 if (!device_trylock(parent))
67 return -EAGAIN; 67 return -EAGAIN;
68 ret = device_for_each_child(parent, parent, umc_bus_pre_reset_helper); 68 ret = device_for_each_child(parent, parent, umc_bus_pre_reset_helper);
69 if (ret >= 0) 69 if (ret >= 0)