Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[firefly-linux-kernel-4.4.55.git] / drivers / bluetooth / btmrvl_drv.h

diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
index 330f8f84928d4d883be8b246eb78b90bad7f6159..e75f8ee2512cb08ea17579c6d853780a978b3ada 100644 (file)
--- a/drivers/bluetooth/btmrvl_drv.h
+++ b/drivers/bluetooth/btmrvl_drv.h
@@ -28,9 +28,9 @@
 #define BTM_UPLD_SIZE                  2312
 
 /* Time to wait until Host Sleep state change in millisecond */
-#define WAIT_UNTIL_HS_STATE_CHANGED    5000
+#define WAIT_UNTIL_HS_STATE_CHANGED    msecs_to_jiffies(5000)
 /* Time to wait for command response in millisecond */
-#define WAIT_UNTIL_CMD_RESP            5000
+#define WAIT_UNTIL_CMD_RESP            msecs_to_jiffies(5000)
 
 enum rdwr_status {
        RDWR_STATUS_SUCCESS = 0,
@@ -104,6 +104,7 @@ struct btmrvl_private {
 #ifdef CONFIG_DEBUG_FS
        void *debugfs_data;
 #endif
+       bool surprise_removed;
 };
 
 #define MRVL_VENDOR_PKT                        0xFE