Linux-Bluetooth Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH 1/2] Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags
@ 2020-07-21  2:37 Nicolas Boichat
  2020-07-21  2:37 ` [PATCH 2/2] Bluetooth: hci_serdev: Only unregister device if it was registered Nicolas Boichat
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Nicolas Boichat @ 2020-07-21  2:37 UTC (permalink / raw)
  To: Marcel Holtmann
  Cc: Nicolas Boichat, Hans de Goede, Johan Hedberg, linux-bluetooth,
	linux-kernel

HCI_UART_RESET_ON_INIT belongs in hdev_flags, not flags.

Fixes: ce945552fde4a09 ("Bluetooth: hci_h5: Add support for serdev enumerated devices")
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>

---

 drivers/bluetooth/hci_h5.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index e60b2e0773db110..e41854e0d79aae2 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -793,7 +793,7 @@ static int h5_serdev_probe(struct serdev_device *serdev)
 	if (!h5)
 		return -ENOMEM;
 
-	set_bit(HCI_UART_RESET_ON_INIT, &h5->serdev_hu.flags);
+	set_bit(HCI_UART_RESET_ON_INIT, &h5->serdev_hu.hdev_flags);
 
 	h5->hu = &h5->serdev_hu;
 	h5->serdev_hu.serdev = serdev;
-- 
2.28.0.rc0.105.gf9edc3c819-goog


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 2/2] Bluetooth: hci_serdev: Only unregister device if it was registered
  2020-07-21  2:37 [PATCH 1/2] Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags Nicolas Boichat
@ 2020-07-21  2:37 ` Nicolas Boichat
  2020-07-28  7:17   ` Marcel Holtmann
  2020-07-24 11:49 ` [PATCH 1/2] Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags Hans de Goede
  2020-07-28  7:12 ` Marcel Holtmann
  2 siblings, 1 reply; 5+ messages in thread
From: Nicolas Boichat @ 2020-07-21  2:37 UTC (permalink / raw)
  To: Marcel Holtmann
  Cc: Nicolas Boichat, Ian Molton, Johan Hedberg, Sebastian Reichel,
	linux-bluetooth, linux-kernel

We should not call hci_unregister_dev if the device was not
successfully registered.

Fixes: c34dc3bfa7642fd ("Bluetooth: hci_serdev: Introduce hci_uart_unregister_device()")
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>

---

 drivers/bluetooth/hci_serdev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/bluetooth/hci_serdev.c b/drivers/bluetooth/hci_serdev.c
index 599855e4c57c13d..7b233312e723fb2 100644
--- a/drivers/bluetooth/hci_serdev.c
+++ b/drivers/bluetooth/hci_serdev.c
@@ -355,7 +355,8 @@ void hci_uart_unregister_device(struct hci_uart *hu)
 	struct hci_dev *hdev = hu->hdev;
 
 	clear_bit(HCI_UART_PROTO_READY, &hu->flags);
-	hci_unregister_dev(hdev);
+	if (test_bit(HCI_UART_REGISTERED, &hu->flags))
+		hci_unregister_dev(hdev);
 	hci_free_dev(hdev);
 
 	cancel_work_sync(&hu->write_work);
-- 
2.28.0.rc0.105.gf9edc3c819-goog


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/2] Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags
  2020-07-21  2:37 [PATCH 1/2] Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags Nicolas Boichat
  2020-07-21  2:37 ` [PATCH 2/2] Bluetooth: hci_serdev: Only unregister device if it was registered Nicolas Boichat
@ 2020-07-24 11:49 ` Hans de Goede
  2020-07-28  7:12 ` Marcel Holtmann
  2 siblings, 0 replies; 5+ messages in thread
From: Hans de Goede @ 2020-07-24 11:49 UTC (permalink / raw)
  To: Nicolas Boichat, Marcel Holtmann
  Cc: Johan Hedberg, linux-bluetooth, linux-kernel

Hi,

On 7/21/20 4:37 AM, Nicolas Boichat wrote:
> HCI_UART_RESET_ON_INIT belongs in hdev_flags, not flags.
> 
> Fixes: ce945552fde4a09 ("Bluetooth: hci_h5: Add support for serdev enumerated devices")
> Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>

Patch looks good to me:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans




> 
> ---
> 
>   drivers/bluetooth/hci_h5.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
> index e60b2e0773db110..e41854e0d79aae2 100644
> --- a/drivers/bluetooth/hci_h5.c
> +++ b/drivers/bluetooth/hci_h5.c
> @@ -793,7 +793,7 @@ static int h5_serdev_probe(struct serdev_device *serdev)
>   	if (!h5)
>   		return -ENOMEM;
>   
> -	set_bit(HCI_UART_RESET_ON_INIT, &h5->serdev_hu.flags);
> +	set_bit(HCI_UART_RESET_ON_INIT, &h5->serdev_hu.hdev_flags);
>   
>   	h5->hu = &h5->serdev_hu;
>   	h5->serdev_hu.serdev = serdev;
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/2] Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags
  2020-07-21  2:37 [PATCH 1/2] Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags Nicolas Boichat
  2020-07-21  2:37 ` [PATCH 2/2] Bluetooth: hci_serdev: Only unregister device if it was registered Nicolas Boichat
  2020-07-24 11:49 ` [PATCH 1/2] Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags Hans de Goede
@ 2020-07-28  7:12 ` Marcel Holtmann
  2 siblings, 0 replies; 5+ messages in thread
From: Marcel Holtmann @ 2020-07-28  7:12 UTC (permalink / raw)
  To: Nicolas Boichat
  Cc: Hans de Goede, Johan Hedberg, linux-bluetooth, linux-kernel

Hi Nicolas,

> HCI_UART_RESET_ON_INIT belongs in hdev_flags, not flags.
> 
> Fixes: ce945552fde4a09 ("Bluetooth: hci_h5: Add support for serdev enumerated devices")
> Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
> 
> ---
> 
> drivers/bluetooth/hci_h5.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 2/2] Bluetooth: hci_serdev: Only unregister device if it was registered
  2020-07-21  2:37 ` [PATCH 2/2] Bluetooth: hci_serdev: Only unregister device if it was registered Nicolas Boichat
@ 2020-07-28  7:17   ` Marcel Holtmann
  0 siblings, 0 replies; 5+ messages in thread
From: Marcel Holtmann @ 2020-07-28  7:17 UTC (permalink / raw)
  To: Nicolas Boichat
  Cc: Ian Molton, Johan Hedberg, Sebastian Reichel,
	Bluetooth Kernel Mailing List, linux-kernel

Hi Nicolas,

> We should not call hci_unregister_dev if the device was not
> successfully registered.
> 
> Fixes: c34dc3bfa7642fd ("Bluetooth: hci_serdev: Introduce hci_uart_unregister_device()")
> Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
> 
> ---
> 
> drivers/bluetooth/hci_serdev.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-21  2:37 [PATCH 1/2] Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags Nicolas Boichat
2020-07-21  2:37 ` [PATCH 2/2] Bluetooth: hci_serdev: Only unregister device if it was registered Nicolas Boichat
2020-07-28  7:17   ` Marcel Holtmann
2020-07-24 11:49 ` [PATCH 1/2] Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags Hans de Goede
2020-07-28  7:12 ` Marcel Holtmann

Linux-Bluetooth Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-bluetooth/0 linux-bluetooth/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-bluetooth linux-bluetooth/ https://lore.kernel.org/linux-bluetooth \
		linux-bluetooth@vger.kernel.org
	public-inbox-index linux-bluetooth

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-bluetooth


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git