diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2009-11-13 11:53:59 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 14:55:21 -0500 |
commit | fb34d53752d5bec5acc73422e462a9c68aeeaa2a (patch) | |
tree | 6a395f2a0246cd3d721753c60af13e8f9b2e9c41 /drivers/bluetooth/btusb.c | |
parent | 576a362ad2103da481e1f6e13de01f33d3d4c7b1 (diff) |
USB: remove the auto_pm flag
This patch (as1302) removes the auto_pm flag from struct usb_device.
The flag's only purpose was to distinguish between autosuspends and
external suspends, but that information is now available in the
pm_message_t argument passed to suspend methods.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/bluetooth/btusb.c')
-rw-r--r-- | drivers/bluetooth/btusb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 44bc8bbabf54..4d2905996751 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
@@ -1066,7 +1066,7 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message) | |||
1066 | return 0; | 1066 | return 0; |
1067 | 1067 | ||
1068 | spin_lock_irq(&data->txlock); | 1068 | spin_lock_irq(&data->txlock); |
1069 | if (!(interface_to_usbdev(intf)->auto_pm && data->tx_in_flight)) { | 1069 | if (!((message.event & PM_EVENT_AUTO) && data->tx_in_flight)) { |
1070 | set_bit(BTUSB_SUSPENDING, &data->flags); | 1070 | set_bit(BTUSB_SUSPENDING, &data->flags); |
1071 | spin_unlock_irq(&data->txlock); | 1071 | spin_unlock_irq(&data->txlock); |
1072 | } else { | 1072 | } else { |