android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: Use zalloc when possible

Browse Source 
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>
This commit is contained in:
Johan Hedberg
2015-06-18 20:50:08 +03:00
parent 7e730c7f3d
commit 39ecfad68f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/bluetooth/hci_core.c
View File

@ -2716,11 +2716,10 @@ int hci_add_adv_instance(struct hci_dev *hdev, u8 instance, u32 flags,
instance < 1 || instance > HCI_MAX_ADV_INSTANCES) instance < 1 || instance > HCI_MAX_ADV_INSTANCES)
return -EOVERFLOW; return -EOVERFLOW;
adv_instance = kmalloc(sizeof(*adv_instance), GFP_KERNEL); adv_instance = kzalloc(sizeof(*adv_instance), GFP_KERNEL);
if (!adv_instance) if (!adv_instance)
return -ENOMEM; return -ENOMEM;
memset(adv_instance, 0, sizeof(*adv_instance));
adv_instance->pending = true; adv_instance->pending = true;
adv_instance->instance = instance; adv_instance->instance = instance;
list_add(&adv_instance->list, &hdev->adv_instances); list_add(&adv_instance->list, &hdev->adv_instances);