* [PATCH] btusb:fix crash with quirky dongles doing sound
@ 2011-02-11 12:00 Oliver Neukum
2011-02-11 17:43 ` Gustavo F. Padovan
0 siblings, 1 reply; 2+ messages in thread
From: Oliver Neukum @ 2011-02-11 12:00 UTC (permalink / raw)
To: Marcel Holtmann, Gustavo F. Padovan, linux-bluetooth, linux-usb,
stable, ensonic
=46rom befd2cd1a7875d395f72b38f2cb89a03f16edaba Mon Sep 17 00:00:00 2001
=46rom: Oliver Neukum <oliver@neukum.org>
Date: Fri, 11 Feb 2011 12:35:05 +0100
Subject: [PATCH] btusb:fix crash with quirky dongles doing sound
Quirky dongles sometimes do not use the iso interface which
causes a crash with runtime PM
Signed-off-by: Oliver Neukum <oneukum@suse.de>
=2D--
drivers/bluetooth/btusb.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 1da773f..08c8629 100644
=2D-- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -826,7 +826,7 @@ static void btusb_work(struct work_struct *work)
=20
if (hdev->conn_hash.sco_num > 0) {
if (!test_bit(BTUSB_DID_ISO_RESUME, &data->flags)) {
=2D err =3D usb_autopm_get_interface(data->isoc);
+ err =3D usb_autopm_get_interface(data->isoc ? data->isoc : data->intf);
if (err < 0) {
clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
usb_kill_anchored_urbs(&data->isoc_anchor);
@@ -855,7 +855,7 @@ static void btusb_work(struct work_struct *work)
=20
__set_isoc_interface(hdev, 0);
if (test_and_clear_bit(BTUSB_DID_ISO_RESUME, &data->flags))
=2D usb_autopm_put_interface(data->isoc);
+ usb_autopm_put_interface(data->isoc ? data->isoc : data->intf);
}
}
=20
=2D-=20
1.7.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] btusb:fix crash with quirky dongles doing sound
2011-02-11 12:00 [PATCH] btusb:fix crash with quirky dongles doing sound Oliver Neukum
@ 2011-02-11 17:43 ` Gustavo F. Padovan
0 siblings, 0 replies; 2+ messages in thread
From: Gustavo F. Padovan @ 2011-02-11 17:43 UTC (permalink / raw)
To: Oliver Neukum
Cc: Marcel Holtmann, linux-bluetooth, linux-usb, stable, ensonic
Hi Oliver,
* Oliver Neukum <oneukum@suse.de> [2011-02-11 13:00:06 +0100]:
> From befd2cd1a7875d395f72b38f2cb89a03f16edaba Mon Sep 17 00:00:00 2001
> From: Oliver Neukum <oliver@neukum.org>
> Date: Fri, 11 Feb 2011 12:35:05 +0100
> Subject: [PATCH] btusb:fix crash with quirky dongles doing sound
>
> Quirky dongles sometimes do not use the iso interface which
> causes a crash with runtime PM
>
> Signed-off-by: Oliver Neukum <oneukum@suse.de>
> ---
> drivers/bluetooth/btusb.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
Applied. It should be in mainline soon. Thanks.
--
Gustavo F. Padovan
http://profusion.mobi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-11 17:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-11 12:00 [PATCH] btusb:fix crash with quirky dongles doing sound Oliver Neukum
2011-02-11 17:43 ` Gustavo F. Padovan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox