Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-net-2025-12-19' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Luiz Augusto von Dentz says:
====================
bluetooth pull request for net:
- MGMT: report BIS capability flags in supported settings
- btusb: revert use of devm_kzalloc in btusb
* tag 'for-net-2025-12-19' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth:
Bluetooth: btusb: revert use of devm_kzalloc in btusb
Bluetooth: MGMT: report BIS capability flags in supported settings
====================
Link: https://patch.msgid.link/20251219223118.90141-1-luiz.dentz@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+15
-3
+9
-3
drivers/bluetooth/btusb.c
+9
-3
drivers/bluetooth/btusb.c
···
4052
4052
return -ENODEV;
4053
4053
}
4054
4054
4055
-
data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL);
4055
+
data = kzalloc(sizeof(*data), GFP_KERNEL);
4056
4056
if (!data)
4057
4057
return -ENOMEM;
4058
4058
···
4075
4075
}
4076
4076
}
4077
4077
4078
-
if (!data->intr_ep || !data->bulk_tx_ep || !data->bulk_rx_ep)
4078
+
if (!data->intr_ep || !data->bulk_tx_ep || !data->bulk_rx_ep) {
4079
+
kfree(data);
4079
4080
return -ENODEV;
4081
+
}
4080
4082
4081
4083
if (id->driver_info & BTUSB_AMP) {
4082
4084
data->cmdreq_type = USB_TYPE_CLASS | 0x01;
···
4133
4131
data->recv_acl = hci_recv_frame;
4134
4132
4135
4133
hdev = hci_alloc_dev_priv(priv_size);
4136
-
if (!hdev)
4134
+
if (!hdev) {
4135
+
kfree(data);
4137
4136
return -ENOMEM;
4137
+
}
4138
4138
4139
4139
hdev->bus = HCI_USB;
4140
4140
hci_set_drvdata(hdev, data);
···
4410
4406
if (data->reset_gpio)
4411
4407
gpiod_put(data->reset_gpio);
4412
4408
hci_free_dev(hdev);
4409
+
kfree(data);
4413
4410
return err;
4414
4411
}
4415
4412
···
4459
4454
}
4460
4455
4461
4456
hci_free_dev(hdev);
4457
+
kfree(data);
4462
4458
}
4463
4459
4464
4460
#ifdef CONFIG_PM
+6
net/bluetooth/mgmt.c
+6
net/bluetooth/mgmt.c
···
849
849
if (cis_peripheral_capable(hdev))
850
850
settings |= MGMT_SETTING_CIS_PERIPHERAL;
851
851
852
+
if (bis_capable(hdev))
853
+
settings |= MGMT_SETTING_ISO_BROADCASTER;
854
+
855
+
if (sync_recv_capable(hdev))
856
+
settings |= MGMT_SETTING_ISO_SYNC_RECEIVER;
857
+
852
858
if (ll_privacy_capable(hdev))
853
859
settings |= MGMT_SETTING_LL_PRIVACY;
854
860