evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFC: pn533: Fix open parenthesis alignment

Browse source 
Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Waldemar Rymarkiewicz 2012-12-10 14:42:51 +01:00 • committed by Samuel Ortiz
parent 37cf4fc6c9
commit 5d467742bc
1 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/nfc/pn533.c
View file

@ -1187,9 +1187,8 @@ static int pn533_target_found_felica(struct nfc_target *nfc_tgt, u8 *tgt_data,
if (!pn533_target_felica_is_valid(tgt_felica, tgt_data_len)) if (!pn533_target_felica_is_valid(tgt_felica, tgt_data_len))
return -EPROTO; return -EPROTO;
if (tgt_felica->nfcid2[0] == PN533_FELICA_SENSF_NFCID2_DEP_B1 && if ((tgt_felica->nfcid2[0] == PN533_FELICA_SENSF_NFCID2_DEP_B1) &&
tgt_felica->nfcid2[1] == (tgt_felica->nfcid2[1] == PN533_FELICA_SENSF_NFCID2_DEP_B2))
PN533_FELICA_SENSF_NFCID2_DEP_B2)
nfc_tgt->supported_protocols = NFC_PROTO_NFC_DEP_MASK; nfc_tgt->supported_protocols = NFC_PROTO_NFC_DEP_MASK;
else else
nfc_tgt->supported_protocols = NFC_PROTO_FELICA_MASK; nfc_tgt->supported_protocols = NFC_PROTO_FELICA_MASK;
@ -2533,8 +2532,7 @@ static int pn533_probe(struct usb_interface *interface,
dev->out_frame = kmalloc(PN533_NORMAL_FRAME_MAX_LEN, GFP_KERNEL); dev->out_frame = kmalloc(PN533_NORMAL_FRAME_MAX_LEN, GFP_KERNEL);
dev->out_urb = usb_alloc_urb(0, GFP_KERNEL); dev->out_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!dev->in_frame || !dev->out_frame || if (!dev->in_frame || !dev->out_frame || !dev->in_urb || !dev->out_urb)
!dev->in_urb || !dev->out_urb)
goto error; goto error;
usb_fill_bulk_urb(dev->in_urb, dev->udev, usb_fill_bulk_urb(dev->in_urb, dev->udev,
@ -2542,8 +2540,7 @@ static int pn533_probe(struct usb_interface *interface,
NULL, 0, NULL, dev); NULL, 0, NULL, dev);
usb_fill_bulk_urb(dev->out_urb, dev->udev, usb_fill_bulk_urb(dev->out_urb, dev->udev,
usb_sndbulkpipe(dev->udev, out_endpoint), usb_sndbulkpipe(dev->udev, out_endpoint),
NULL, 0, NULL, 0, pn533_send_complete, dev);
pn533_send_complete, dev);
INIT_WORK(&dev->cmd_work, pn533_wq_cmd); INIT_WORK(&dev->cmd_work, pn533_wq_cmd);
INIT_WORK(&dev->cmd_complete_work, pn533_wq_cmd_complete); INIT_WORK(&dev->cmd_complete_work, pn533_wq_cmd_complete);