---

yaml --- r: 122175 b: refs/heads/master c: 45555c0 h: refs/heads/master i: 122173: 3013e37 122171: de38cd6 122167: ec7ef13 122159: 41c4d73 122143: a3e2a6b 122111: 5ca8caf v: v3
git-mirror · Nov 26, 2008 · f612b7a · f612b7a
1 parent 787dee6
commit f612b7a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff0db0490a2eb6db4f03870987c5c8e3dd81e747
+refs/heads/master: 45555c0ed436b8b06eeaa5c524a3377e6d24fb45
diff --git a/trunk/net/bluetooth/rfcomm/sock.c b/trunk/net/bluetooth/rfcomm/sock.c
@@ -792,7 +792,9 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c
 
 static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {
+#if defined(CONFIG_BT_RFCOMM_TTY) || defined(CONFIG_BT_RFCOMM_DEBUG)
 	struct sock *sk = sock->sk;
+#endif
 	int err;
 
 	BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);