diff options
| author | Eric Lapuyade <eric.lapuyade@intel.com> | 2012-04-10 19:43:10 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 15:10:37 -0400 |
| commit | 01ae0eea9bed132a9c4a2c207dbf8e05b0051071 (patch) | |
| tree | 7de07ede2d172edaa27bfae617b89b2068d36044 /net | |
| parent | c4fbb6515a4dcec83d340247639b5644c4745528 (diff) | |
| download | op-kernel-dev-01ae0eea9bed132a9c4a2c207dbf8e05b0051071.zip op-kernel-dev-01ae0eea9bed132a9c4a2c207dbf8e05b0051071.tar.gz | |
NFC: Fix next target_idx type and rename for clarity
Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/nfc/core.c | 2 | ||||
| -rw-r--r-- | net/nfc/rawsock.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/nfc/core.c b/net/nfc/core.c index d924000..db88429 100644 --- a/net/nfc/core.c +++ b/net/nfc/core.c @@ -435,7 +435,7 @@ int nfc_targets_found(struct nfc_dev *dev, dev->polling = false; for (i = 0; i < n_targets; i++) - targets[i].idx = dev->target_idx++; + targets[i].idx = dev->target_next_idx++; spin_lock_bh(&dev->targets_lock); diff --git a/net/nfc/rawsock.c b/net/nfc/rawsock.c index b2825aa..ec1134c 100644 --- a/net/nfc/rawsock.c +++ b/net/nfc/rawsock.c @@ -92,8 +92,8 @@ static int rawsock_connect(struct socket *sock, struct sockaddr *_addr, goto error; } - if (addr->target_idx > dev->target_idx - 1 || - addr->target_idx < dev->target_idx - dev->n_targets) { + if (addr->target_idx > dev->target_next_idx - 1 || + addr->target_idx < dev->target_next_idx - dev->n_targets) { rc = -EINVAL; goto error; } |
