diff options
| author | Paul Mundt <[email protected]> | 2009-11-18 10:53:52 +0900 |
|---|---|---|
| committer | Paul Mundt <[email protected]> | 2009-11-18 10:53:52 +0900 |
| commit | 260af56271f79da0e37faa5a99b1786b221297e5 (patch) | |
| tree | d76a2609f940b88083314d5f9131c73115bd4dcb /drivers/bluetooth/btusb.c | |
| parent | 1dca899e95d27475c9036ce1cf857a72852b9c53 (diff) | |
| parent | 648f15345add88a7eea724365fe1217a8d8a1e16 (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'drivers/bluetooth/btusb.c')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 7ba91aa3fe8b..2fb38027f3bb 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -591,6 +591,7 @@ static int btusb_close(struct hci_dev *hdev) return 0; cancel_work_sync(&data->work); + cancel_work_sync(&data->waker); clear_bit(BTUSB_ISOC_RUNNING, &data->flags); clear_bit(BTUSB_BULK_RUNNING, &data->flags); |