diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-14 14:43:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-14 14:43:40 +0200 |
| commit | 9cba26e66d09bf394ae5a739627a1dc8b7cae6f4 (patch) | |
| tree | f03743d576a0c7826b9921ad47e70370ebe80a22 /net/nfc/llcp/commands.c | |
| parent | ec83db0f78cd44c3b586ec1c3a348d1a8a389797 (diff) | |
| parent | 73eff9f56e15598c8399c0b86899fd889b97f085 (diff) | |
Merge branch 'perf/uprobes' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/uprobes
Diffstat (limited to 'net/nfc/llcp/commands.c')
| -rw-r--r-- | net/nfc/llcp/commands.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/nfc/llcp/commands.c b/net/nfc/llcp/commands.c index 7b76eb7192f..ef10ffcb4b6 100644 --- a/net/nfc/llcp/commands.c +++ b/net/nfc/llcp/commands.c @@ -474,7 +474,7 @@ int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock, while (remaining_len > 0) { - frag_len = min_t(u16, local->remote_miu, remaining_len); + frag_len = min_t(size_t, local->remote_miu, remaining_len); pr_debug("Fragment %zd bytes remaining %zd", frag_len, remaining_len); @@ -497,7 +497,7 @@ int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock, release_sock(sk); remaining_len -= frag_len; - msg_ptr += len; + msg_ptr += frag_len; } kfree(msg_data); |