diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2009-11-13 17:53:59 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 20:55:21 +0100 |
| commit | fb34d53752d5bec5acc73422e462a9c68aeeaa2a (patch) | |
| tree | 6a395f2a0246cd3d721753c60af13e8f9b2e9c41 /drivers/bluetooth | |
| parent | USB: hcd.c: quiet NULL pointer sparse noise (diff) | |
| download | linux-fb34d53752d5bec5acc73422e462a9c68aeeaa2a.tar.xz linux-fb34d53752d5bec5acc73422e462a9c68aeeaa2a.zip | |
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')
| -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) return 0; spin_lock_irq(&data->txlock); - if (!(interface_to_usbdev(intf)->auto_pm && data->tx_in_flight)) { + if (!((message.event & PM_EVENT_AUTO) && data->tx_in_flight)) { set_bit(BTUSB_SUSPENDING, &data->flags); spin_unlock_irq(&data->txlock); } else { |