diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-02-08 09:03:32 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-02-08 09:03:32 +0100 |
| commit | 0f8aa6b66e304eaaa0756c7017a6d1dd080edd38 (patch) | |
| tree | e1f1ee2a8f514ac3d602144c9342a7348c9b26db /drivers | |
| parent | facdf73173e23560bca6e414d5a99c337cb0fa2d (diff) | |
| parent | 64b811627651cb58c0feac58a3c2c7c8b94f3881 (diff) | |
| download | barebox-0f8aa6b66e304eaaa0756c7017a6d1dd080edd38.tar.gz barebox-0f8aa6b66e304eaaa0756c7017a6d1dd080edd38.tar.xz | |
Merge branch 'for-next/constify'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/f_fastboot.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 2ba5977239..87a43cc60e 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -935,6 +935,7 @@ static void cb_flash(struct usb_ep *ep, struct usb_request *req, const char *cmd } if (IS_ENABLED(CONFIG_BAREBOX_UPDATE) && filetype_is_barebox_image(filetype)) { + void *image; struct bbu_data data = { .devicefile = filename, .imagefile = FASTBOOT_TMPFILE, @@ -946,15 +947,17 @@ static void cb_flash(struct usb_ep *ep, struct usb_request *req, const char *cmd fastboot_tx_print(f_fb, "INFOThis is a barebox image..."); - data.image = read_file(data.imagefile, &data.len); - if (!data.image) { + image = read_file(data.imagefile, &data.len); + if (!image) { fastboot_tx_print(f_fb, "FAILreading barebox"); return; } + data.image = image; + ret = barebox_update(&data); - free(data.image); + free(image); if (ret) { fastboot_tx_print(f_fb, "FAILupdate barebox: %s", strerror(-ret)); |