Merge tag 'v3.15-rc6' into next/defconfig

[karo-tx-linux.git] / drivers / bluetooth / btmrvl_debugfs.c

diff --git a/drivers/bluetooth/btmrvl_debugfs.c b/drivers/bluetooth/btmrvl_debugfs.c
index db2c3c305df8ea183d499861089e7e446d2beabe..023d35e3c7a75b573a52d99cbda5bd98c64e017f 100644 (file)
--- a/drivers/bluetooth/btmrvl_debugfs.c
+++ b/drivers/bluetooth/btmrvl_debugfs.c
@@ -43,7 +43,7 @@ static ssize_t btmrvl_hscfgcmd_write(struct file *file,
        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
                return -EFAULT;
 
-       ret = strict_strtol(buf, 10, &result);
+       ret = kstrtol(buf, 10, &result);
        if (ret)
                return ret;
 
@@ -89,7 +89,7 @@ static ssize_t btmrvl_pscmd_write(struct file *file, const char __user *ubuf,
        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
                return -EFAULT;
 
-       ret = strict_strtol(buf, 10, &result);
+       ret = kstrtol(buf, 10, &result);
        if (ret)
                return ret;
 
@@ -135,7 +135,7 @@ static ssize_t btmrvl_hscmd_write(struct file *file, const char __user *ubuf,
        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
                return -EFAULT;
 
-       ret = strict_strtol(buf, 10, &result);
+       ret = kstrtol(buf, 10, &result);
        if (ret)
                return ret;