diff options
author | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 19:05:17 +0300 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 19:05:17 +0300 |
commit | 415d2b3392d7a80903e0f97f051201aa02bf20e9 (patch) | |
tree | 47492d2386a0e7f00ef645313cb44ae4960b7e7e /drivers/uwb/est.c | |
parent | 4f65245f2d178b9cba48350620d76faa4a098841 (diff) | |
parent | b8e759b8f6dab1c473c30ac12709095d0b81078e (diff) | |
download | linux-415d2b3392d7a80903e0f97f051201aa02bf20e9.tar.xz |
Merge branch 'for-4.19/cougar' into for-linus
New device support for hid-cougar
Diffstat (limited to 'drivers/uwb/est.c')
-rw-r--r-- | drivers/uwb/est.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/est.c b/drivers/uwb/est.c index f3e232584284..ad30ddfe30b3 100644 --- a/drivers/uwb/est.c +++ b/drivers/uwb/est.c @@ -217,7 +217,7 @@ static int uwb_est_grow(void) { size_t actual_size = uwb_est_size * sizeof(uwb_est[0]); - void *new = kmalloc(2 * actual_size, GFP_ATOMIC); + void *new = kmalloc_array(2, actual_size, GFP_ATOMIC); if (new == NULL) return -ENOMEM; memcpy(new, uwb_est, actual_size); |