Bluetooth: hci_uart: Fix speed selection
hu->proto->*speed will always be used for all device where it is set.
But hu->*speed should be used if exist, so the test should be swapped.
The equivalent change is needed in bcm_setup() of hci_bcm.c.
Signed-off-by: Frederic Danis <frederic.danis@linux.intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 590bd8e..177dd69 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -370,10 +370,10 @@
int err;
/* Init speed if any */
- if (hu->proto->init_speed)
- speed = hu->proto->init_speed;
- else if (hu->init_speed)
+ if (hu->init_speed)
speed = hu->init_speed;
+ else if (hu->proto->init_speed)
+ speed = hu->proto->init_speed;
else
speed = 0;
@@ -381,10 +381,10 @@
hci_uart_set_baudrate(hu, speed);
/* Operational speed if any */
- if (hu->proto->oper_speed)
- speed = hu->proto->oper_speed;
- else if (hu->oper_speed)
+ if (hu->oper_speed)
speed = hu->oper_speed;
+ else if (hu->proto->oper_speed)
+ speed = hu->proto->oper_speed;
else
speed = 0;