diff options
| author | Ding Xiang <dingxiang@cmss.chinamobile.com> | 2018-08-26 22:55:00 -0400 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2018-09-27 12:57:39 +0200 |
| commit | 385613506aef4d21448f8f167513f46a008a3b0c (patch) | |
| tree | df42a9e56f40911e9ed1e5776050638069067c4f /drivers/bluetooth/bt3c_cs.c | |
| parent | 7cbfd1e2aad410d96fa6162aeb3f9cff1fecfc58 (diff) | |
| download | lwn-385613506aef4d21448f8f167513f46a008a3b0c.tar.gz lwn-385613506aef4d21448f8f167513f46a008a3b0c.zip | |
Bluetooth: bt3c_cs: Fix obsolete function
simple_strtol and simple_strtoul are obsolete, both place
use kstrtouint instead.
V2: fix error tmp += tn
V3: fix compile error
Signed-off-by: Ding Xiang <dingxiang@cmss.chinamobile.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/bt3c_cs.c')
| -rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 25b0cf952b91..54713833951a 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c @@ -448,7 +448,7 @@ static int bt3c_load_firmware(struct bt3c_info *info, { char *ptr = (char *) firmware; char b[9]; - unsigned int iobase, tmp; + unsigned int iobase, tmp, tn; unsigned long size, addr, fcs; int i, err = 0; @@ -490,7 +490,9 @@ static int bt3c_load_firmware(struct bt3c_info *info, memset(b, 0, sizeof(b)); for (tmp = 0, i = 0; i < size; i++) { memcpy(b, ptr + (i * 2) + 2, 2); - tmp += simple_strtol(b, NULL, 16); + if (kstrtouint(b, 16, &tn)) + return -EINVAL; + tmp += tn; } if (((tmp + fcs) & 0xff) != 0xff) { @@ -505,7 +507,8 @@ static int bt3c_load_firmware(struct bt3c_info *info, memset(b, 0, sizeof(b)); for (i = 0; i < (size - 4) / 2; i++) { memcpy(b, ptr + (i * 4) + 12, 4); - tmp = simple_strtoul(b, NULL, 16); + if (kstrtouint(b, 16, &tmp)) + return -EINVAL; bt3c_put(iobase, tmp); } } |