diff options
| author | Oliver Neukum <oneukum@suse.de> | 2011-02-11 13:00:06 +0100 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-02-16 15:53:45 -0300 |
| commit | 8efdd0cdc54f3bb5db464b3baf88f7441f54da47 (patch) | |
| tree | a84f3d07d83aaa8a0744a77d92505d8128363b93 /drivers/bluetooth | |
| parent | a7b545f7fe753ca3dc1b51ca57f90cd59d974e44 (diff) | |
| download | kernel_samsung_smdk4412-8efdd0cdc54f3bb5db464b3baf88f7441f54da47.tar.gz kernel_samsung_smdk4412-8efdd0cdc54f3bb5db464b3baf88f7441f54da47.tar.bz2 kernel_samsung_smdk4412-8efdd0cdc54f3bb5db464b3baf88f7441f54da47.zip | |
Bluetooth: 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>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | 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 4cefa91e6c3..664f1cc9f8d 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -829,7 +829,7 @@ static void btusb_work(struct work_struct *work) if (hdev->conn_hash.sco_num > 0) { if (!test_bit(BTUSB_DID_ISO_RESUME, &data->flags)) { - err = usb_autopm_get_interface(data->isoc); + err = 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); @@ -858,7 +858,7 @@ static void btusb_work(struct work_struct *work) __set_isoc_interface(hdev, 0); if (test_and_clear_bit(BTUSB_DID_ISO_RESUME, &data->flags)) - usb_autopm_put_interface(data->isoc); + usb_autopm_put_interface(data->isoc ? data->isoc : data->intf); } } |