Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 351898
b: refs/heads/master
c: a579809
h: refs/heads/master
v: v3
  • Loading branch information
Waldemar Rymarkiewicz authored and Samuel Ortiz committed Jan 9, 2013
1 parent 13705d7 commit 37a3c7a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e8f40531113c7e8c6266886803d5bf3a9e5c8d1b
refs/heads/master: a5798094e927847f0d503b756a997175d7ce01ec
7 changes: 1 addition & 6 deletions trunk/drivers/nfc/pn533.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -2515,7 +2512,6 @@ static int pn533_probe(struct usb_interface *interface,
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;
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 37a3c7a

Please sign in to comment.