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/slimbus/qcom-ctrl.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/slimbus/qcom-ctrl.c')
-rw-r--r-- | drivers/slimbus/qcom-ctrl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c index bb36a8fbc9b1..db1f5135846a 100644 --- a/drivers/slimbus/qcom-ctrl.c +++ b/drivers/slimbus/qcom-ctrl.c @@ -540,7 +540,7 @@ static int qcom_slim_probe(struct platform_device *pdev) ctrl->tx.sl_sz = SLIM_MSGQ_BUF_LEN; ctrl->rx.n = QCOM_RX_MSGS; ctrl->rx.sl_sz = SLIM_MSGQ_BUF_LEN; - ctrl->wr_comp = kzalloc(sizeof(struct completion *) * QCOM_TX_MSGS, + ctrl->wr_comp = kcalloc(QCOM_TX_MSGS, sizeof(struct completion *), GFP_KERNEL); if (!ctrl->wr_comp) return -ENOMEM; |