[PATCH] Revert "Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174"

[PATCH] Revert "Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174"

[Hans de Goede]

Commit f44cb4b19ed4 ("Bluetooth: btusb: Fix quirk for Atheros
1525/QCA6174") is causing bluetooth to no longer work for several
people, see: https://bugzilla.redhat.com/show_bug.cgi?id=1568911

So lets revert it for now and try to find another solution for
devices which need the modified quirk.

Cc: stable@vger.kernel.org
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/bluetooth/btusb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 7f987c81c006..55693648b211 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -231,6 +231,7 @@ static const struct usb_device_id blacklist_table[] = {
 	{ USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 },
+	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x0cf3, 0x311e), .driver_info = BTUSB_ATH3012 },
@@ -263,7 +264,6 @@ static const struct usb_device_id blacklist_table[] = {
 	{ USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 },
 
 	/* QCA ROME chipset */
-	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_QCA_ROME },
 	{ USB_DEVICE(0x0cf3, 0xe007), .driver_info = BTUSB_QCA_ROME },
 	{ USB_DEVICE(0x0cf3, 0xe009), .driver_info = BTUSB_QCA_ROME },
 	{ USB_DEVICE(0x0cf3, 0xe010), .driver_info = BTUSB_QCA_ROME },
-- 
2.17.0

Re: [PATCH] Revert "Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174"

[Marcel Holtmann]

Hi Hans,

> Commit f44cb4b19ed4 ("Bluetooth: btusb: Fix quirk for Atheros
> 1525/QCA6174") is causing bluetooth to no longer work for several
> people, see: https://bugzilla.redhat.com/show_bug.cgi?id=1568911
> 
> So lets revert it for now and try to find another solution for
> devices which need the modified quirk.
> 
> Cc: stable@vger.kernel.org
> Cc: Takashi Iwai <tiwai@suse.de>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> drivers/bluetooth/btusb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel

Re: [PATCH] Revert "Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174"

[Hans de Goede]

Hi,

On 26-04-18 14:22, Marcel Holtmann wrote:
> Hi Hans,
> 
>> Commit f44cb4b19ed4 ("Bluetooth: btusb: Fix quirk for Atheros
>> 1525/QCA6174") is causing bluetooth to no longer work for several
>> people, see: https://bugzilla.redhat.com/show_bug.cgi?id=1568911
>>
>> So lets revert it for now and try to find another solution for
>> devices which need the modified quirk.
>>
>> Cc: stable@vger.kernel.org
>> Cc: Takashi Iwai <tiwai@suse.de>
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>> ---
>> drivers/bluetooth/btusb.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> patch has been applied to bluetooth-next tree.

This is a regression fix, so can we please get this into 4.17-rc#
so that Greg can then take it into 4.16.z ?

Thanks,

Hans

Re: [PATCH] Revert "Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174"

[Hans de Goede]

Hi,

On 26-04-18 20:28, Hans de Goede wrote:
> Hi,
> 
> On 26-04-18 14:22, Marcel Holtmann wrote:
>> Hi Hans,
>>
>>> Commit f44cb4b19ed4 ("Bluetooth: btusb: Fix quirk for Atheros
>>> 1525/QCA6174") is causing bluetooth to no longer work for several
>>> people, see: https://bugzilla.redhat.com/show_bug.cgi?id=1568911
>>>
>>> So lets revert it for now and try to find another solution for
>>> devices which need the modified quirk.
>>>
>>> Cc: stable@vger.kernel.org
>>> Cc: Takashi Iwai <tiwai@suse.de>
>>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>>> ---
>>> drivers/bluetooth/btusb.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> patch has been applied to bluetooth-next tree.
> 
> This is a regression fix, so can we please get this into 4.17-rc#
> so that Greg can then take it into 4.16.z ?

Also see: https://bugzilla.kernel.org/show_bug.cgi?id=199271

Regards,

Hans

Re: [PATCH] Revert "Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174"

[Marcel Holtmann]

Hi Hans,

>>>> Commit f44cb4b19ed4 ("Bluetooth: btusb: Fix quirk for Atheros
>>>> 1525/QCA6174") is causing bluetooth to no longer work for several
>>>> people, see: https://bugzilla.redhat.com/show_bug.cgi?id=1568911
>>>> 
>>>> So lets revert it for now and try to find another solution for
>>>> devices which need the modified quirk.
>>>> 
>>>> Cc: stable@vger.kernel.org
>>>> Cc: Takashi Iwai <tiwai@suse.de>
>>>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>>>> ---
>>>> drivers/bluetooth/btusb.c | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>> 
>>> patch has been applied to bluetooth-next tree.
>> This is a regression fix, so can we please get this into 4.17-rc#
>> so that Greg can then take it into 4.16.z ?
> 
> Also see: https://bugzilla.kernel.org/show_bug.cgi?id=199271

I will do that, but I also wanted it to sit in bluetooth-next for a few days in case something else breaks.

Regards

Marcel