diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-12-27 12:53:20 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-12-27 12:53:20 -0800 |
| commit | dd55580a6f3d72175f0cb78c9fc4fac59cf9be09 (patch) | |
| tree | 39bb820cbe6d2a093abb72cc837c52c95039c9c7 /src/phHal4Nfc_ADD.c | |
| parent | 5199e59069db67d4f3bb2a466adab2e4647e8e70 (diff) | |
| parent | 68c93f6f41998fbff40a3396a633faee4d595695 (diff) | |
| download | external_libnfc-nxp-dd55580a6f3d72175f0cb78c9fc4fac59cf9be09.zip external_libnfc-nxp-dd55580a6f3d72175f0cb78c9fc4fac59cf9be09.tar.gz external_libnfc-nxp-dd55580a6f3d72175f0cb78c9fc4fac59cf9be09.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/libnfc-nxp into aosp
Conflicts:
src/phHal4Nfc_ADD.c
Change-Id: I950a66598954d21b49f723da2c58bff2ba719239
Diffstat (limited to 'src/phHal4Nfc_ADD.c')
| -rwxr-xr-x | src/phHal4Nfc_ADD.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/phHal4Nfc_ADD.c b/src/phHal4Nfc_ADD.c index 54dd1c1..9461e43 100755 --- a/src/phHal4Nfc_ADD.c +++ b/src/phHal4Nfc_ADD.c @@ -671,12 +671,15 @@ void phHal4Nfc_TargetDiscoveryComplete( if(phHal_eNfcIP1_Target == Hal4Ctxt->rem_dev_list[Count-1]->RemDevType) { - (void)memcpy( - (void *)Hal4Ctxt->rem_dev_list[0], - (void *)Hal4Ctxt->rem_dev_list[Count-1], - sizeof(phHal_sRemoteDevInformation_t) - ); - NfcIpDeviceCount = 1; + if (Count != 1) + { + (void)memcpy( + (void *)Hal4Ctxt->rem_dev_list[0], + (void *)Hal4Ctxt->rem_dev_list[Count-1], + sizeof(phHal_sRemoteDevInformation_t) + ); + } + NfcIpDeviceCount = 1; break; } } |