aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>2012-12-10 08:42:58 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2013-01-09 18:51:44 -0500
commita5798094e927847f0d503b756a997175d7ce01ec (patch)
treeda829f3a50df2b6f36911c2de260b06fe4ab8bce /drivers/nfc
parente8f40531113c7e8c6266886803d5bf3a9e5c8d1b (diff)
NFC: pn533: Remove deprecated dev->out_frame buff
As it's not used anymore get rid of that buffer. 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.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index cfbfc1183926..82867a036ccc 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -327,8 +327,6 @@ struct pn533 {
327 struct nfc_dev *nfc_dev; 327 struct nfc_dev *nfc_dev;
328 328
329 struct urb *out_urb; 329 struct urb *out_urb;
330 struct pn533_frame *out_frame;
331
332 struct urb *in_urb; 330 struct urb *in_urb;
333 331
334 struct sk_buff_head resp_q; 332 struct sk_buff_head resp_q;
@@ -2427,10 +2425,9 @@ static int pn533_probe(struct usb_interface *interface,
2427 } 2425 }
2428 2426
2429 dev->in_urb = usb_alloc_urb(0, GFP_KERNEL); 2427 dev->in_urb = usb_alloc_urb(0, GFP_KERNEL);
2430 dev->out_frame = kmalloc(PN533_NORMAL_FRAME_MAX_LEN, GFP_KERNEL);
2431 dev->out_urb = usb_alloc_urb(0, GFP_KERNEL); 2428 dev->out_urb = usb_alloc_urb(0, GFP_KERNEL);
2432 2429
2433 if (!dev->out_frame || !dev->in_urb || !dev->out_urb) 2430 if (!dev->in_urb || !dev->out_urb)
2434 goto error; 2431 goto error;
2435 2432
2436 usb_fill_bulk_urb(dev->in_urb, dev->udev, 2433 usb_fill_bulk_urb(dev->in_urb, dev->udev,
@@ -2515,7 +2512,6 @@ destroy_wq:
2515 destroy_workqueue(dev->wq); 2512 destroy_workqueue(dev->wq);
2516error: 2513error:
2517 usb_free_urb(dev->in_urb); 2514 usb_free_urb(dev->in_urb);
2518 kfree(dev->out_frame);
2519 usb_free_urb(dev->out_urb); 2515 usb_free_urb(dev->out_urb);
2520 kfree(dev); 2516 kfree(dev);
2521 return rc; 2517 return rc;
@@ -2547,7 +2543,6 @@ static void pn533_disconnect(struct usb_interface *interface)
2547 } 2543 }
2548 2544
2549 usb_free_urb(dev->in_urb); 2545 usb_free_urb(dev->in_urb);
2550 kfree(dev->out_frame);
2551 usb_free_urb(dev->out_urb); 2546 usb_free_urb(dev->out_urb);
2552 kfree(dev); 2547 kfree(dev);
2553 2548