summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2014-11-19 10:28:34 +0100
committerMarcel Holtmann <marcel@holtmann.org>2014-11-19 16:22:42 +0100
commit4c79e1dd3e121bd5aae0425c48f877a5de07e6d6 (patch)
tree6d034d684d8bbe2974fdfbc468847a6722b67b87
parentBluetooth: btmrvl: add DT-bindings for gpio-gap (diff)
downloadlinux-4c79e1dd3e121bd5aae0425c48f877a5de07e6d6.tar.xz
linux-4c79e1dd3e121bd5aae0425c48f877a5de07e6d6.zip
Bluetooth: btmrvl: update hs_state in interrupt handler
Host sleep status flag should be reset when there is an interrupt from device. Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Cathy Luo <cluo@marvell.com> Signed-off-by: Avinash Patil <patila@marvell.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--drivers/bluetooth/btmrvl_main.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index e43c495e8181..bb0d2c26a479 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -41,6 +41,11 @@ void btmrvl_interrupt(struct btmrvl_private *priv)
priv->adapter->int_count++;
+ if (priv->adapter->hs_state == HS_ACTIVATED) {
+ BT_DBG("BT: HS DEACTIVATED in ISR!\n");
+ priv->adapter->hs_state = HS_DEACTIVATED;
+ }
+
wake_up_interruptible(&priv->main_thread.wait_q);
}
EXPORT_SYMBOL_GPL(btmrvl_interrupt);
@@ -323,6 +328,7 @@ int btmrvl_prepare_command(struct btmrvl_private *priv)
} else {
ret = priv->hw_wakeup_firmware(priv);
priv->adapter->hs_state = HS_DEACTIVATED;
+ BT_DBG("BT: HS DEACTIVATED due to host activity!\n");
}
}