Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 45555c0ed436b8b06eeaa5c524a3377e6d24fb45

Authored by Ingo Molnar
Committed by David S. Miller
1 parent ff0db0490a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

bluetooth: fix warning in net/bluetooth/rfcomm/sock.c 

fix this warning:

  net/bluetooth/rfcomm/sock.c: In function ‘rfcomm_sock_ioctl’:
  net/bluetooth/rfcomm/sock.c:795: warning: unused variable ‘sk’

perhaps BT_DEBUG() should be improved to do printf format checking
instead of the #ifdef, but that looks quite intrusive: each bluetooth
.c file undefines the macro.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

net/bluetooth/rfcomm/sock.c
Diff comments   View file @ 45555c0
... ... @@ -792,7 +792,9 @@
792 792  
793 793 static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
794 794 {
  795 +#if defined(CONFIG_BT_RFCOMM_TTY) || defined(CONFIG_BT_RFCOMM_DEBUG)
795 796 struct sock *sk = sock->sk;
  797 +#endif
796 798 int err;
797 799  
798 800 BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);