diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-31 14:24:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-31 14:24:35 -0500 |
| commit | b4804cdd5747d1d932bd338e0ca102ade51b8b6b (patch) | |
| tree | dd3aa210c95de630ee7e62a58e7924e73ee0458a /drivers/usb/gadget/f_rockusb.c | |
| parent | fad42d3afbeb23e86fae2bb56ba863a2a5a133e1 (diff) | |
| parent | 723fd5668ff2c8dd19e808778b5670d0fa6bdc4b (diff) | |
| download | u-boot-b4804cdd5747d1d932bd338e0ca102ade51b8b6b.zip u-boot-b4804cdd5747d1d932bd338e0ca102ade51b8b6b.tar.gz u-boot-b4804cdd5747d1d932bd338e0ca102ade51b8b6b.tar.bz2 | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-usb
- Assorted gadget changes including:
- dfu: Fix handling of UBI partitions in MTD backend
- gadget: f_thor: fix wrong file size cast
- Extend cmd: bcb
- Fixes for fastboot and rockchip gadgets
- dfu: Add SCRIPT and SKIP entities
- dfu/thor: Add `dfu_alt_info` reinitialization from flashed script
- u-boot: Reduce size of u-boot as usbd_device_* arrays are not exported
Diffstat (limited to 'drivers/usb/gadget/f_rockusb.c')
| -rw-r--r-- | drivers/usb/gadget/f_rockusb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c index 9ae02ae..bd846ce 100644 --- a/drivers/usb/gadget/f_rockusb.c +++ b/drivers/usb/gadget/f_rockusb.c @@ -110,7 +110,7 @@ struct f_rockusb *get_rkusb(void) if (!f_rkusb) { f_rkusb = memalign(CONFIG_SYS_CACHELINE_SIZE, sizeof(*f_rkusb)); if (!f_rkusb) - return 0; + return NULL; rockusb_func = f_rkusb; memset(f_rkusb, 0, sizeof(*f_rkusb)); @@ -120,7 +120,7 @@ struct f_rockusb *get_rkusb(void) f_rkusb->buf_head = memalign(CONFIG_SYS_CACHELINE_SIZE, RKUSB_BUF_SIZE); if (!f_rkusb->buf_head) - return 0; + return NULL; f_rkusb->buf = f_rkusb->buf_head; memset(f_rkusb->buf_head, 0, RKUSB_BUF_SIZE); @@ -309,8 +309,9 @@ static int rockusb_add(struct usb_configuration *c) status = usb_add_function(c, &f_rkusb->usb_function); if (status) { + free(f_rkusb->buf_head); free(f_rkusb); - rockusb_func = f_rkusb; + rockusb_func = NULL; } return status; } |