1 files changed, 2 insertions, 1 deletions

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 0dcc96266779..b2eb2b93580f 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -418,7 +418,8 @@ static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_
                 data = &tv;
                 len = sizeof(tv);
 #ifdef CONFIG_COMPAT
-                if (msg->msg_flags & MSG_CMSG_COMPAT) {
+                if (!COMPAT_USE_64BIT_TIME &&
+                    (msg->msg_flags & MSG_CMSG_COMPAT)) {
                         ctv.tv_sec = tv.tv_sec;
                         ctv.tv_usec = tv.tv_usec;
                         data = &ctv;