diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-13 06:38:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-13 06:38:46 +0200 |
| commit | d864991b220b7c62e81d21209e1fd978fd67352c (patch) | |
| tree | b570a1ad6fc1b959c5bcda6ceca0b321319c01e0 /drivers/bluetooth | |
| parent | Merge branch 's390-qeth-next' (diff) | |
| parent | Merge tag 'armsoc-fixes-4.19' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-d864991b220b7c62e81d21209e1fd978fd67352c.tar.xz linux-d864991b220b7c62e81d21209e1fd978fd67352c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/hci_qca.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index d98ed0442201..9f1392fc7105 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -1356,7 +1356,7 @@ static int qca_init_regulators(struct qca_power *qca, { int i; - qca->vreg_bulk = devm_kzalloc(qca->dev, num_vregs * + qca->vreg_bulk = devm_kcalloc(qca->dev, num_vregs, sizeof(struct regulator_bulk_data), GFP_KERNEL); if (!qca->vreg_bulk) |