diff options
Diffstat (limited to 'net/nfc/nci/ntf.c')
| -rw-r--r-- | net/nfc/nci/ntf.c | 10 | 
1 files changed, 3 insertions, 7 deletions
diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c index b2aa98ef092..f8f6af23138 100644 --- a/net/nfc/nci/ntf.c +++ b/net/nfc/nci/ntf.c @@ -20,8 +20,7 @@   *  GNU General Public License for more details.   *   *  You should have received a copy of the GNU General Public License - *  along with this program; if not, write to the Free Software - *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA + *  along with this program; if not, see <http://www.gnu.org/licenses/>.   *   */ @@ -367,7 +366,6 @@ static int nci_extract_activation_params_nfc_dep(struct nci_dev *ndev,  			struct nci_rf_intf_activated_ntf *ntf, __u8 *data)  {  	struct activation_params_poll_nfc_dep *poll; -	int i;  	switch (ntf->activation_rf_tech_and_mode) {  	case NCI_NFC_A_PASSIVE_POLL_MODE: @@ -375,10 +373,8 @@ static int nci_extract_activation_params_nfc_dep(struct nci_dev *ndev,  		poll = &ntf->activation_params.poll_nfc_dep;  		poll->atr_res_len = min_t(__u8, *data++, 63);  		pr_debug("atr_res_len %d\n", poll->atr_res_len); -		if (poll->atr_res_len > 0) { -			for (i = 0; i < poll->atr_res_len; i++) -				poll->atr_res[poll->atr_res_len-1-i] = data[i]; -		} +		if (poll->atr_res_len > 0) +			memcpy(poll->atr_res, data, poll->atr_res_len);  		break;  	default:  | 
