summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>2012-12-10 14:42:58 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2013-01-10 00:51:44 +0100
commita5798094e927847f0d503b756a997175d7ce01ec (patch)
treeda829f3a50df2b6f36911c2de260b06fe4ab8bce /drivers
parentNFC: pn533: Use skb in __pn533_send_cmd_frame_asyn (diff)
downloadlinux-a5798094e927847f0d503b756a997175d7ce01ec.tar.xz
linux-a5798094e927847f0d503b756a997175d7ce01ec.zip
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')
-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 {
struct nfc_dev *nfc_dev;
struct urb *out_urb;
- struct pn533_frame *out_frame;
-
struct urb *in_urb;
struct sk_buff_head resp_q;
@@ -2427,10 +2425,9 @@ static int pn533_probe(struct usb_interface *interface,
}
dev->in_urb = usb_alloc_urb(0, GFP_KERNEL);
- dev->out_frame = kmalloc(PN533_NORMAL_FRAME_MAX_LEN, GFP_KERNEL);
dev->out_urb = usb_alloc_urb(0, GFP_KERNEL);
- if (!dev->out_frame || !dev->in_urb || !dev->out_urb)
+ if (!dev->in_urb || !dev->out_urb)
goto error;
usb_fill_bulk_urb(dev->in_urb, dev->udev,
@@ -2515,7 +2512,6 @@ destroy_wq:
destroy_workqueue(dev->wq);
error:
usb_free_urb(dev->in_urb);
- kfree(dev->out_frame);
usb_free_urb(dev->out_urb);
kfree(dev);
return rc;
@@ -2547,7 +2543,6 @@ static void pn533_disconnect(struct usb_interface *interface)
}
usb_free_urb(dev->in_urb);
- kfree(dev->out_frame);
usb_free_urb(dev->out_urb);
kfree(dev);