Commit 44b31652 authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Felipe Balbi

usb: gadget: printer: add missing error handling

If cdev_add() in printer_bind_config() fails, care is taken to
reverse the effects of initializations completed until the fail
happens. But if printer_req_alloc() fails, it is just one of the
two lists that is cleaned up while the effects of cdev_add()
and device_create() are not reverted.

This patch changes error handling so that at least as much cleanup is done
as when a failure happens before printer_req_alloc() invocations.
Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent f5bda003
...@@ -1249,31 +1249,18 @@ static int __init printer_bind_config(struct usb_configuration *c) ...@@ -1249,31 +1249,18 @@ static int __init printer_bind_config(struct usb_configuration *c)
dev->current_rx_bytes = 0; dev->current_rx_bytes = 0;
dev->current_rx_buf = NULL; dev->current_rx_buf = NULL;
status = -ENOMEM;
for (i = 0; i < QLEN; i++) { for (i = 0; i < QLEN; i++) {
req = printer_req_alloc(dev->in_ep, USB_BUFSIZE, GFP_KERNEL); req = printer_req_alloc(dev->in_ep, USB_BUFSIZE, GFP_KERNEL);
if (!req) { if (!req)
while (!list_empty(&dev->tx_reqs)) { goto fail;
req = container_of(dev->tx_reqs.next,
struct usb_request, list);
list_del(&req->list);
printer_req_free(dev->in_ep, req);
}
return -ENOMEM;
}
list_add(&req->list, &dev->tx_reqs); list_add(&req->list, &dev->tx_reqs);
} }
for (i = 0; i < QLEN; i++) { for (i = 0; i < QLEN; i++) {
req = printer_req_alloc(dev->out_ep, USB_BUFSIZE, GFP_KERNEL); req = printer_req_alloc(dev->out_ep, USB_BUFSIZE, GFP_KERNEL);
if (!req) { if (!req)
while (!list_empty(&dev->rx_reqs)) { goto fail;
req = container_of(dev->rx_reqs.next,
struct usb_request, list);
list_del(&req->list);
printer_req_free(dev->out_ep, req);
}
return -ENOMEM;
}
list_add(&req->list, &dev->rx_reqs); list_add(&req->list, &dev->rx_reqs);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment