aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>2012-12-10 08:42:52 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2013-01-09 18:51:40 -0500
commitb08e860355ba6f67b769c9061f468f7a8856bad9 (patch)
tree3b2643d73702440ee3a07077c082368d8feaa95e /drivers/nfc
parent5d467742bc53eff6233bd437c13dcefb449246f8 (diff)
NFC: pn533: Fix minor style issues
Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/pn533.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index 02043dc430b9..2cb8ceb9be8d 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -1376,13 +1376,13 @@ static void pn533_poll_create_mod_list(struct pn533 *dev,
1376{ 1376{
1377 pn533_poll_reset_mod_list(dev); 1377 pn533_poll_reset_mod_list(dev);
1378 1378
1379 if (im_protocols & NFC_PROTO_MIFARE_MASK 1379 if ((im_protocols & NFC_PROTO_MIFARE_MASK) ||
1380 || im_protocols & NFC_PROTO_ISO14443_MASK 1380 (im_protocols & NFC_PROTO_ISO14443_MASK) ||
1381 || im_protocols & NFC_PROTO_NFC_DEP_MASK) 1381 (im_protocols & NFC_PROTO_NFC_DEP_MASK))
1382 pn533_poll_add_mod(dev, PN533_POLL_MOD_106KBPS_A); 1382 pn533_poll_add_mod(dev, PN533_POLL_MOD_106KBPS_A);
1383 1383
1384 if (im_protocols & NFC_PROTO_FELICA_MASK 1384 if (im_protocols & NFC_PROTO_FELICA_MASK ||
1385 || im_protocols & NFC_PROTO_NFC_DEP_MASK) { 1385 im_protocols & NFC_PROTO_NFC_DEP_MASK) {
1386 pn533_poll_add_mod(dev, PN533_POLL_MOD_212KBPS_FELICA); 1386 pn533_poll_add_mod(dev, PN533_POLL_MOD_212KBPS_FELICA);
1387 pn533_poll_add_mod(dev, PN533_POLL_MOD_424KBPS_FELICA); 1387 pn533_poll_add_mod(dev, PN533_POLL_MOD_424KBPS_FELICA);
1388 } 1388 }