Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <7b461780-8ae3-0444-9d43-83177f07f4f3@icloud.com>
Date:   Thu, 13 Jul 2023 08:06:20 -0400
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: Re: [RFC PATCH] Bluetooth: btusb: Fix bluetooth on Intel Macbook 2014
To:     =?UTF-8?Q?Tomasz_Mo=c5=84?= <tomasz.mon@nordicsemi.no>,
        linux-bluetooth@vger.kernel.org,
        Luiz Augusto von Dentz <luiz.dentz@gmail.com>,
        Johan Hedberg <johan.hedberg@gmail.com>,
        Marcel Holtmann <marcel@holtmann.org>
Cc:     =?UTF-8?Q?Carles_Cuf=c3=ad?= <carles.cufi@nordicsemi.no>,
        Paul Menzel <pmenzel@molgen.mpg.de>
References: <20230713102514.699277-1-tomasz.mon@nordicsemi.no>
Content-Language: en-US
From:   John Holland <johnbholland@icloud.com>
In-Reply-To: <20230713102514.699277-1-tomasz.mon@nordicsemi.no>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk


> Commit c13380a55522 ("Bluetooth: btusb: Do not require hardcoded
> interface numbers") inadvertedly broke bluetooth on Intel Macbook 2014.
> The intention was to keep behavior intact when BTUSB_IFNUM_2 is set and
> otherwise allow any interface numbers. The problem is that the new logic
> condition omits the case where bInterfaceNumber is 0.
>
> Fix BTUSB_IFNUM_2 handling by allowing both interface number 0 and 2
> when the flag is set.
>
> Fixes: c13380a55522 ("Bluetooth: btusb: Do not require hardcoded interface numbers")
> Reported-by: John Holland <johnbholland@icloud.com>
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217651
> Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
> ---
>   drivers/bluetooth/btusb.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index d844fb8e7cb7..ab7d62538b48 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -4258,6 +4258,7 @@ static int btusb_probe(struct usb_interface *intf,
>   	BT_DBG("intf %p id %p", intf, id);
>   
>   	if ((id->driver_info & BTUSB_IFNUM_2) &&
> +	    (intf->cur_altsetting->desc.bInterfaceNumber != 0) &&
>   	    (intf->cur_altsetting->desc.bInterfaceNumber != 2))
>   		return -ENODEV;
>   

Tested-by: John Holland<johnbholland@icloud.com>