aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2015-06-18 17:50:08 (GMT)
committerJohan Hedberg <johan.hedberg@intel.com>2015-06-18 18:00:06 (GMT)
commit39ecfad68f14b71b6d1917c27eb01c4936f88bda (patch)
tree66826df9fd312dd376e521a708e9c88d0acae542 /net/bluetooth
parent7e730c7f3d1f39c25cf5f7cf70c0ff4c28d7bec7 (diff)
Bluetooth: Use zalloc when possible
Use zallog for adv_instance allocation instead of kmalloc + memset. This also fixes the following coccinelle warning: >> net/bluetooth/hci_core.c:2693:17-24: WARNING: kzalloc should be used for adv_instance, instead of kmalloc/memset Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 86ed44e..2f8fb33 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2716,11 +2716,10 @@ int hci_add_adv_instance(struct hci_dev *hdev, u8 instance, u32 flags,
instance < 1 || instance > HCI_MAX_ADV_INSTANCES)
return -EOVERFLOW;
- adv_instance = kmalloc(sizeof(*adv_instance), GFP_KERNEL);
+ adv_instance = kzalloc(sizeof(*adv_instance), GFP_KERNEL);
if (!adv_instance)
return -ENOMEM;
- memset(adv_instance, 0, sizeof(*adv_instance));
adv_instance->pending = true;
adv_instance->instance = instance;
list_add(&adv_instance->list, &hdev->adv_instances);

Privacy Policy