diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-01-08 16:07:32 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-01-08 16:07:32 +0000 |
| commit | 147923b1a901a0370f83a0f4c58ec1baffef22f0 (patch) | |
| tree | 349c735bbae9c259a493c535e193dfab0332574c /hw/usb/dev-mtp.c | |
| parent | 21a43af0f18335af4abb1959aa28ee9d159a2d43 (diff) | |
| parent | efce3175fd572e4d98af0b50ae9cb8d7b808f034 (diff) | |
| download | qemu-147923b1a901a0370f83a0f4c58ec1baffef22f0.zip qemu-147923b1a901a0370f83a0f4c58ec1baffef22f0.tar.gz qemu-147923b1a901a0370f83a0f4c58ec1baffef22f0.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20190108-pull-request' into staging
usb: generic sysbus ehci, bugfixes.
# gpg: Signature made Tue 08 Jan 2019 15:53:37 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/usb-20190108-pull-request:
usb: move ehci_create_ich9_with_companions to hw/i386
hw/usb: Add generic sys-bus EHCI controller
usb: dev-mtp: fix memory leak in error path
usb: drop unnecessary usb_device_post_load checks
hw/usb: fix mistaken de-initialization of CCID state
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/dev-mtp.c')
| -rw-r--r-- | hw/usb/dev-mtp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 6098005..b19b576 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1729,6 +1729,7 @@ static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen) if (strchr(filename, '/')) { usb_mtp_queue_result(s, RES_PARAMETER_NOT_SUPPORTED, d->trans, 0, 0, 0, 0); + g_free(filename); return; } |