1 files changed, 9 insertions, 25 deletions

diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index 0e8e1a59856c..463ffa4fe042 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -14,8 +14,6 @@ static struct class *bt_class;
 struct dentry *bt_debugfs = NULL;
 EXPORT_SYMBOL_GPL(bt_debugfs);
 
-static struct workqueue_struct *bt_workq;
-
 static inline char *link_typetostr(int type)
 {
         switch (type) {
@@ -161,14 +159,14 @@ void hci_conn_add_sysfs(struct hci_conn *conn)
 {
         BT_DBG("conn %p", conn);
 
-        queue_work(bt_workq, &conn->work_add);
+        queue_work(conn->hdev->workqueue, &conn->work_add);
 }
 
 void hci_conn_del_sysfs(struct hci_conn *conn)
 {
         BT_DBG("conn %p", conn);
 
-        queue_work(bt_workq, &conn->work_del);
+        queue_work(conn->hdev->workqueue, &conn->work_del);
 }
 
 static inline char *host_bustostr(int bus)
@@ -283,11 +281,9 @@ static ssize_t show_idle_timeout(struct device *dev, struct device_attribute *at
 static ssize_t store_idle_timeout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct hci_dev *hdev = dev_get_drvdata(dev);
-        char *ptr;
-        __u32 val;
+        unsigned long val;
 
-        val = simple_strtoul(buf, &ptr, 10);
-        if (ptr == buf)
+        if (strict_strtoul(buf, 0, &val) < 0)
                 return -EINVAL;
 
         if (val != 0 && (val < 500 || val > 3600000))
@@ -307,11 +303,9 @@ static ssize_t show_sniff_max_interval(struct device *dev, struct device_attribu
 static ssize_t store_sniff_max_interval(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct hci_dev *hdev = dev_get_drvdata(dev);
-        char *ptr;
-        __u16 val;
+        unsigned long val;
 
-        val = simple_strtoul(buf, &ptr, 10);
-        if (ptr == buf)
+        if (strict_strtoul(buf, 0, &val) < 0)
                 return -EINVAL;
 
         if (val < 0x0002 || val > 0xFFFE || val % 2)
@@ -334,11 +328,9 @@ static ssize_t show_sniff_min_interval(struct device *dev, struct device_attribu
 static ssize_t store_sniff_min_interval(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct hci_dev *hdev = dev_get_drvdata(dev);
-        char *ptr;
-        __u16 val;
+        unsigned long val;
 
-        val = simple_strtoul(buf, &ptr, 10);
-        if (ptr == buf)
+        if (strict_strtoul(buf, 0, &val) < 0)
                 return -EINVAL;
 
         if (val < 0x0002 || val > 0xFFFE || val % 2)
@@ -487,17 +479,11 @@ void hci_unregister_sysfs(struct hci_dev *hdev)
 
 int __init bt_sysfs_init(void)
 {
-        bt_workq = create_singlethread_workqueue("bluetooth");
-        if (!bt_workq)
-                return -ENOMEM;
-
         bt_debugfs = debugfs_create_dir("bluetooth", NULL);
 
         bt_class = class_create(THIS_MODULE, "bluetooth");
-        if (IS_ERR(bt_class)) {
-                destroy_workqueue(bt_workq);
+        if (IS_ERR(bt_class))
                 return PTR_ERR(bt_class);
-        }
 
         return 0;
 }
@@ -507,6 +493,4 @@ void bt_sysfs_cleanup(void)
         class_destroy(bt_class);
 
         debugfs_remove_recursive(bt_debugfs);
-
-        destroy_workqueue(bt_workq);
 }