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>
{
char fw_name[64];
const struct firmware *fw;
{
char fw_name[64];
const struct firmware *fw;
int err;
BT_DBG("hu %p", hu);
int err;
BT_DBG("hu %p", hu);
- if (hu->proto->init_speed)
- hci_uart_set_baudrate(hu, hu->proto->init_speed);
-
- if (hu->proto->oper_speed) {
- err = bcm_set_baudrate(hu, hu->proto->oper_speed);
+ /* Init speed if any */
+ if (hu->init_speed)
+ speed = hu->init_speed;
+ else if (hu->proto->init_speed)
+ speed = hu->proto->init_speed;
+ else
+ speed = 0;
+
+ if (speed)
+ hci_uart_set_baudrate(hu, speed);
+
+ /* Operational speed if any */
+ if (hu->oper_speed)
+ speed = hu->oper_speed;
+ else if (hu->proto->oper_speed)
+ speed = hu->proto->oper_speed;
+ else
+ speed = 0;
+
+ if (speed) {
+ err = bcm_set_baudrate(hu, speed);
- hci_uart_set_baudrate(hu, hu->proto->oper_speed);
+ hci_uart_set_baudrate(hu, speed);
int err;
/* Init speed if any */
int err;
/* Init speed if any */
- if (hu->proto->init_speed)
- speed = hu->proto->init_speed;
- else if (hu->init_speed)
+ else if (hu->proto->init_speed)
+ speed = hu->proto->init_speed;
hci_uart_set_baudrate(hu, speed);
/* Operational speed if any */
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)
+ else if (hu->proto->oper_speed)
+ speed = hu->proto->oper_speed;