]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Bluetooth: btusb: wake system up when receives a wake irq
authorJeffy Chen <jeffy.chen@rock-chips.com>
Fri, 24 Feb 2017 06:24:29 +0000 (14:24 +0800)
committerMarcel Holtmann <marcel@holtmann.org>
Wed, 12 Apr 2017 20:02:38 +0000 (22:02 +0200)
Currrently we are disabling this wake irq after receiving it. If this
happens before we finish suspend and the pm event check is disabled,
the system will continue suspending, and this irq would not work again.

We may need to abort system suspend to avoid that.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
drivers/bluetooth/btusb.c

index eb78d235a34a29f8b0e6cad904b179b71802069a..7fa373b428f8dc081e93271dd95d23a098c243ee 100644 (file)
@@ -26,6 +26,7 @@
 #include <linux/firmware.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
+#include <linux/suspend.h>
 #include <asm/unaligned.h>
 
 #include <net/bluetooth/bluetooth.h>
@@ -2799,6 +2800,7 @@ static irqreturn_t btusb_oob_wake_handler(int irq, void *priv)
        struct btusb_data *data = priv;
 
        pm_wakeup_event(&data->udev->dev, 0);
+       pm_system_wakeup();
 
        /* Disable only if not already disabled (keep it balanced) */
        if (test_and_clear_bit(BTUSB_OOB_WAKE_ENABLED, &data->flags)) {