| Message ID | 20200801154346.63882-1-samuel@sholland.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] Bluetooth: hci_h5: Stop erroneously setting HCI_UART_REGISTERED | expand |
On 8/1/20 10:43 AM, Samuel Holland wrote: > This code attempts to set the HCI_UART_RESET_ON_INIT flag. However, > it sets the bit in the wrong flag word: HCI_UART_RESET_ON_INIT goes in > hu->hdev_flags, not hu->flags. So it is actually setting > HCI_UART_REGISTERED, which is bit 1 in hu->flags. > > Since commit cba736465e5c ("Bluetooth: hci_serdev: Remove setting of > HCI_QUIRK_RESET_ON_CLOSE."), this flag is ignored for hci_serdev users, > so instead of fixing which flag is set, let's remove the flag entirely. > > Cc: stable@vger.kernel.org > Fixes: ce945552fde4 ("Bluetooth: hci_h5: Add support for serdev enumerated devices") > Signed-off-by: Samuel Holland <samuel@sholland.org> > --- > drivers/bluetooth/hci_h5.c | 2 -- > 1 file changed, 2 deletions(-) Sorry, I didn't see the other patches that were just added to -next. I'll rebase my additional changes on top of them and resend. Regards, Samuel
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c index e60b2e0773db..981d96cc7695 100644 --- a/drivers/bluetooth/hci_h5.c +++ b/drivers/bluetooth/hci_h5.c @@ -793,8 +793,6 @@ static int h5_serdev_probe(struct serdev_device *serdev) if (!h5) return -ENOMEM; - set_bit(HCI_UART_RESET_ON_INIT, &h5->serdev_hu.flags); - h5->hu = &h5->serdev_hu; h5->serdev_hu.serdev = serdev; serdev_device_set_drvdata(serdev, h5);
This code attempts to set the HCI_UART_RESET_ON_INIT flag. However, it sets the bit in the wrong flag word: HCI_UART_RESET_ON_INIT goes in hu->hdev_flags, not hu->flags. So it is actually setting HCI_UART_REGISTERED, which is bit 1 in hu->flags. Since commit cba736465e5c ("Bluetooth: hci_serdev: Remove setting of HCI_QUIRK_RESET_ON_CLOSE."), this flag is ignored for hci_serdev users, so instead of fixing which flag is set, let's remove the flag entirely. Cc: stable@vger.kernel.org Fixes: ce945552fde4 ("Bluetooth: hci_h5: Add support for serdev enumerated devices") Signed-off-by: Samuel Holland <samuel@sholland.org> --- drivers/bluetooth/hci_h5.c | 2 -- 1 file changed, 2 deletions(-)