Commit e5b53c0a authored Dec 02, 2014 by Christophe Ricard Committed by Samuel Ortiz Dec 02, 2014

NFC: Fix warning "warning: incorrect type in assignment"



Fix warnings:
net/nfc/llcp_commands.c:421:14: warning: incorrect type in assignment (different base types)
net/nfc/llcp_commands.c:421:14:    expected unsigned short [unsigned] [usertype] miux
net/nfc/llcp_commands.c:421:14:    got restricted __be16
net/nfc/llcp_commands.c:477:14: warning: incorrect type in assignment (different base types)
net/nfc/llcp_commands.c:477:14:    expected unsigned short [unsigned] [usertype] miux
net/nfc/llcp_commands.c:477:14:    got restricted __be16

Procedure to reproduce:
make ARCH=x86_64 allmodconfig
make C=1 CF=-D__CHECK_ENDIAN__

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

parent 18159624

net/nfc/llcp_commands.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -401,7 +401,8 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock)
		u8 *miux_tlv = NULL, miux_tlv_length;
		u8 *rw_tlv = NULL, rw_tlv_length, rw;
		int err;
		u16 size = 0, miux;
		u16 size = 0;
		__be16 miux;

		pr_debug("Sending CONNECT\n");

		@@ -465,7 +466,8 @@ int nfc_llcp_send_cc(struct nfc_llcp_sock *sock)
		u8 *miux_tlv = NULL, miux_tlv_length;
		u8 *rw_tlv = NULL, rw_tlv_length, rw;
		int err;
		u16 size = 0, miux;
		u16 size = 0;
		__be16 miux;

		pr_debug("Sending CC\n");