From: Mark A. Greer <mgreer@animalcreek.com>
Date: Wed, 2 Jul 2014 16:01:56 +0000 (-0700)
Subject: NFC: digital: Check for NFC-DEP before checking for Type 4 tag
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~149^2~12^2~43^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b4dbca5e49eea2567d0da777fea2c86e7b89622;p=pandora-kernel.git

NFC: digital: Check for NFC-DEP before checking for Type 4 tag

In digital_in_recv_sel_res(), the code that determines
the tag type will interpret bits 7:6 (lsb being b1 as
per the Digital Specification) of a SEL RES set to 11b
as a Type 4 tag.  This is okay except that the neard
will interpret the same value as an NFC-DEP device
(in src/tag.c:set_tag_type() in the neard source).

Make the digital layer's interpretation match neard's
interpretation by changing the order of the checks in
digital_in_recv_sel_res() so that a value of 11b in
bits 7:6 is interpreted as an NFC-DEP device instead
of a Type 4 tag.

Acked-by: Thierry Escande <thierry.escande@linux.intel.com>
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

Reading git-diff-tree failed