aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-05-19 16:34:27 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-05-19 16:34:27 -0400
commit20b4f9c73ff4137d720c4f378e1a780ac6a6c04d (patch)
tree91fd288124acb748d5442d8f517eb3de004e8400 /net
parentath9k_htc: Stop ANI before doing hw_reset (diff)
parentBluetooth: Fix L2CAP LE debugfs entries permissions (diff)
downloadlinux-dev-20b4f9c73ff4137d720c4f378e1a780ac6a6c04d.tar.xz
linux-dev-20b4f9c73ff4137d720c4f378e1a780ac6a6c04d.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index a1e5bb7d06e8..dc4d301d3a72 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -7519,9 +7519,9 @@ int __init l2cap_init(void)
l2cap_debugfs = debugfs_create_file("l2cap", 0444, bt_debugfs,
NULL, &l2cap_debugfs_fops);
- debugfs_create_u16("l2cap_le_max_credits", 0466, bt_debugfs,
+ debugfs_create_u16("l2cap_le_max_credits", 0644, bt_debugfs,
&le_max_credits);
- debugfs_create_u16("l2cap_le_default_mps", 0466, bt_debugfs,
+ debugfs_create_u16("l2cap_le_default_mps", 0644, bt_debugfs,
&le_default_mps);
bt_6lowpan_init();