mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-04 08:08:54 +00:00
Code Issues Releases Wiki Activity

Bluetooth: Move bit-field variable in USB driver to data->flags

Browse source 
did_iso_resume keeps only a bit-field value, so moving that to a proper
flags place.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Gustavo F. Padovan 2010-07-16 17:20:33 -03:00 committed by Marcel Holtmann
parent 5d8868ff3d
commit 08b8b6c454
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/bluetooth/btusb.c
View file

@ -149,6 +149,7 @@ static struct usb_device_id blacklist_table[] = {
#define BTUSB_BULK_RUNNING 1 #define BTUSB_BULK_RUNNING 1
#define BTUSB_ISOC_RUNNING 2 #define BTUSB_ISOC_RUNNING 2
#define BTUSB_SUSPENDING 3 #define BTUSB_SUSPENDING 3
#define BTUSB_DID_ISO_RESUME 4
struct btusb_data { struct btusb_data {
struct hci_dev *hdev; struct hci_dev *hdev;
@ -182,7 +183,6 @@ struct btusb_data {
unsigned int sco_num; unsigned int sco_num;
int isoc_altsetting; int isoc_altsetting;
int suspend_count; int suspend_count;
int did_iso_resume:1;
}; };
static int inc_tx(struct btusb_data *data) static int inc_tx(struct btusb_data *data)
@ -810,7 +810,7 @@ static void btusb_work(struct work_struct *work)
int err; int err;
if (hdev->conn_hash.sco_num > 0) { if (hdev->conn_hash.sco_num > 0) {
if (!data->did_iso_resume) { if (!test_bit(BTUSB_DID_ISO_RESUME, &data->flags)) {
err = usb_autopm_get_interface(data->isoc); err = usb_autopm_get_interface(data->isoc);
if (err < 0) { if (err < 0) {
clear_bit(BTUSB_ISOC_RUNNING, &data->flags); clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
@ -818,7 +818,7 @@ static void btusb_work(struct work_struct *work)
return; return;
} }
data->did_iso_resume = 1; set_bit(BTUSB_DID_ISO_RESUME, &data->flags);
} }
if (data->isoc_altsetting != 2) { if (data->isoc_altsetting != 2) {
clear_bit(BTUSB_ISOC_RUNNING, &data->flags); clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
@ -839,10 +839,8 @@ static void btusb_work(struct work_struct *work)
usb_kill_anchored_urbs(&data->isoc_anchor); usb_kill_anchored_urbs(&data->isoc_anchor);
__set_isoc_interface(hdev, 0); __set_isoc_interface(hdev, 0);
if (data->did_iso_resume) { if (test_and_clear_bit(BTUSB_DID_ISO_RESUME, &data->flags))
data->did_iso_resume = 0;
usb_autopm_put_interface(data->isoc); usb_autopm_put_interface(data->isoc);
}
} }
} }