summaryrefslogtreecommitdiffstats
path: root/lib/kobject.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-07 11:46:56 +0100
committerMark Brown <broonie@linaro.org>2013-10-07 11:46:56 +0100
commit9f9e4266a66b6f9dcde305e85035615c06bdb7f7 (patch)
treec6f867c7a1bf94a3b4f13b19a9ce442c7aec9e79 /lib/kobject.c
parentbf551413038f74343ec4d1413c3610e2362d0aeb (diff)
parent249ce1387b7739dbea2ac1a697e4bf1e37ec06b7 (diff)
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-twl6040
Diffstat (limited to 'lib/kobject.c')
-rw-r--r--lib/kobject.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/kobject.c b/lib/kobject.c
index 96217513470..669bf190d4f 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -933,10 +933,7 @@ const struct kobj_ns_type_operations *kobj_ns_ops(struct kobject *kobj)
bool kobj_ns_current_may_mount(enum kobj_ns_type type)
{
- bool may_mount = false;
-
- if (type == KOBJ_NS_TYPE_NONE)
- return true;
+ bool may_mount = true;
spin_lock(&kobj_ns_type_lock);
if ((type > KOBJ_NS_TYPE_NONE) && (type < KOBJ_NS_TYPES) &&