diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-20 13:08:14 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-20 13:08:14 -0500 |
| commit | 400e020892a9a20eea5d2c9bce8bfb312075c4ba (patch) | |
| tree | ab0fd2f2f58146a2c26d1ee415917b006577bdd0 /net | |
| parent | 65210946f31007d12efcf66586fdcaf6ff3fa8f9 (diff) | |
| parent | 5b412fd11c918171c98a253d8a3484afa9f69ca5 (diff) | |
| download | linux-3.10-400e020892a9a20eea5d2c9bce8bfb312075c4ba.tar.gz linux-3.10-400e020892a9a20eea5d2c9bce8bfb312075c4ba.tar.bz2 linux-3.10-400e020892a9a20eea5d2c9bce8bfb312075c4ba.zip | |
Merge tag 'nfc-fixes-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0
Samuel says:
"This is the first pull request for 3.7 NFC fixes.
We mostly have pn533 fixes here, 2 memory leaks and an early unlocking fix.
Moreover, we also have an LLCP adapter linked list insertion fix."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/nfc/llcp/llcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c index cc10d073c33..9e8f4b2801f 100644 --- a/net/nfc/llcp/llcp.c +++ b/net/nfc/llcp/llcp.c @@ -1210,7 +1210,7 @@ int nfc_llcp_register_device(struct nfc_dev *ndev) local->remote_miu = LLCP_DEFAULT_MIU; local->remote_lto = LLCP_DEFAULT_LTO; - list_add(&llcp_devices, &local->list); + list_add(&local->list, &llcp_devices); return 0; } |