Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / drivers / usb / gadget / f_thor.c

diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index ff1481ba372304f3f8f5af5be18ea2185a6d57b2..18f233ab587617cfb8e5d85780d47c91cd7b7f9e 100644 (file)
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -17,6 +17,7 @@
 
 #include <errno.h>
 #include <common.h>
+#include <console.h>
 #include <malloc.h>
 #include <memalign.h>
 #include <version.h>
@@ -173,7 +174,7 @@ static long long int download_head(unsigned long long total,
                                        transfer_buffer, THOR_STORE_UNIT_SIZE,
                                        (*cnt)++);
                        if (ret) {
-                               error("DFU write failed [%d] cnt: %d",
+                               pr_err("DFU write failed [%d] cnt: %d",
                                      ret, *cnt);
                                return ret;
                        }
@@ -217,20 +218,20 @@ static int download_tail(long long int left, int cnt)
 
        dfu_entity = dfu_get_entity(alt_setting_num);
        if (!dfu_entity) {
-               error("Alt setting: %d entity not found!\n", alt_setting_num);
+               pr_err("Alt setting: %d entity not found!\n", alt_setting_num);
                return -ENOENT;
        }
 
        transfer_buffer = dfu_get_buf(dfu_entity);
        if (!transfer_buffer) {
-               error("Transfer buffer not allocated!");
+               pr_err("Transfer buffer not allocated!");
                return -ENXIO;
        }
 
        if (left) {
                ret = dfu_write(dfu_entity, transfer_buffer, left, cnt++);
                if (ret) {
-                       error("DFU write failed [%d]: left: %llu", ret, left);
+                       pr_err("DFU write failed [%d]: left: %llu", ret, left);
                        return ret;
                }
        }
@@ -244,7 +245,7 @@ static int download_tail(long long int left, int cnt)
         */
        ret = dfu_flush(dfu_entity, transfer_buffer, 0, cnt);
        if (ret)
-               error("DFU flush failed!");
+               pr_err("DFU flush failed!");
 
        return ret;
 }
@@ -284,7 +285,7 @@ static long long int process_rqt_download(const struct rqt_box *rqt)
 
                alt_setting_num = dfu_get_alt(f_name);
                if (alt_setting_num < 0) {
-                       error("Alt setting [%d] to write not found!",
+                       pr_err("Alt setting [%d] to write not found!",
                              alt_setting_num);
                        rsp->ack = -ENODEV;
                        ret = rsp->ack;
@@ -310,7 +311,7 @@ static long long int process_rqt_download(const struct rqt_box *rqt)
                debug("DL EXIT\n");
                break;
        default:
-               error("Operation not supported: %d", rqt->rqt_data);
+               pr_err("Operation not supported: %d", rqt->rqt_data);
                ret = -ENOTSUPP;
        }
 
@@ -341,7 +342,7 @@ static int process_data(void)
                puts("RQT: UPLOAD not supported!\n");
                break;
        default:
-               error("unknown request (%d)", rqt->rqt);
+               pr_err("unknown request (%d)", rqt->rqt);
        }
 
        return ret;
@@ -540,7 +541,7 @@ static int thor_rx_data(void)
 
                status = usb_ep_queue(dev->out_ep, dev->out_req, 0);
                if (status) {
-                       error("kill %s:  resubmit %d bytes --> %d",
+                       pr_err("kill %s:  resubmit %d bytes --> %d",
                              dev->out_ep->name, dev->out_req->length, status);
                        usb_ep_set_halt(dev->out_ep);
                        return -EAGAIN;
@@ -569,12 +570,12 @@ static void thor_tx_data(unsigned char *data, int len)
 
        dev->in_req->length = len;
 
-       debug("%s: dev->in_req->length:%d to_cpy:%d\n", __func__,
+       debug("%s: dev->in_req->length:%d to_cpy:%zd\n", __func__,
              dev->in_req->length, sizeof(data));
 
        status = usb_ep_queue(dev->in_ep, dev->in_req, 0);
        if (status) {
-               error("kill %s:  resubmit %d bytes --> %d",
+               pr_err("kill %s:  resubmit %d bytes --> %d",
                      dev->in_ep->name, dev->in_req->length, status);
                usb_ep_set_halt(dev->in_ep);
        }
@@ -607,7 +608,7 @@ static void thor_rx_tx_complete(struct usb_ep *ep, struct usb_request *req)
        case -ESHUTDOWN:                /* disconnect from host */
        case -EREMOTEIO:                /* short read */
        case -EOVERFLOW:
-               error("ERROR:%d", status);
+               pr_err("ERROR:%d", status);
                break;
        }
 
@@ -663,7 +664,7 @@ thor_func_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
                break;
 
        default:
-               error("thor_setup: unknown request: %d", ctrl->bRequest);
+               pr_err("thor_setup: unknown request: %d", ctrl->bRequest);
        }
 
        if (value >= 0) {
@@ -890,6 +891,7 @@ static void thor_func_disable(struct usb_function *f)
        }
 
        if (dev->out_ep->driver_data) {
+               free(dev->out_req->buf);
                dev->out_req->buf = NULL;
                usb_ep_free_request(dev->out_ep, dev->out_req);
                usb_ep_disable(dev->out_ep);
@@ -971,7 +973,7 @@ static int thor_func_set_alt(struct usb_function *f,
                debug("Communication Data interface\n");
                result = thor_eps_setup(f);
                if (result)
-                       error("%s: EPs setup failed!", __func__);
+                       pr_err("%s: EPs setup failed!", __func__);
                dev->configuration_done = 1;
                break;
        }