diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-08-09 12:00:14 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-08-09 12:00:14 +1000 |
| commit | 0899959f609eaf951098e942bc97a4318708897c (patch) | |
| tree | 5abe8b60b54974dedeba2dc7427fd62e9a691395 /drivers/bluetooth | |
| parent | 987c98507e2ad022fafddb05d80c21f837751893 (diff) | |
| parent | 473c13179c5828f7123a4d9fe449d8bd79fae254 (diff) | |
Merge remote-tracking branch 'bluetooth/master'
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btmrvl_debugfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bluetooth/btmrvl_debugfs.c b/drivers/bluetooth/btmrvl_debugfs.c index db2c3c305df8..023d35e3c7a7 100644 --- 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; |