diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-06 22:12:15 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-06 22:12:15 -0400 |
| commit | 7b4f17bf3653ffff0d5d7b76bb8c2d8c293db4ce (patch) | |
| tree | 95181e37559b4236c8af1d4d47f2fdb9f818755d /drivers/usb/gadget/f_dfu.c | |
| parent | ad7af5d7e4caf49581c7403d5a8edc0f11a5f652 (diff) | |
| parent | 12ff19dbfd93abdb62b7b326fee3f5bfa659a75e (diff) | |
| download | blackbird-obmc-uboot-7b4f17bf3653ffff0d5d7b76bb8c2d8c293db4ce.tar.gz blackbird-obmc-uboot-7b4f17bf3653ffff0d5d7b76bb8c2d8c293db4ce.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers/usb/gadget/f_dfu.c')
| -rw-r--r-- | drivers/usb/gadget/f_dfu.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c index 7d88008f74..8e7c981657 100644 --- a/drivers/usb/gadget/f_dfu.c +++ b/drivers/usb/gadget/f_dfu.c @@ -636,7 +636,7 @@ dfu_prepare_strings(struct f_dfu *f_dfu, int n) f_dfu->strings = calloc(sizeof(struct usb_string), n + 1); if (!f_dfu->strings) - goto enomem; + return -ENOMEM; for (i = 0; i < n; ++i) { de = dfu_get_entity(i); @@ -647,14 +647,6 @@ dfu_prepare_strings(struct f_dfu *f_dfu, int n) f_dfu->strings[i].s = NULL; return 0; - -enomem: - while (i) - f_dfu->strings[--i].s = NULL; - - free(f_dfu->strings); - - return -ENOMEM; } static int dfu_prepare_function(struct f_dfu *f_dfu, int n) |
