diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-13 09:44:25 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-13 09:44:25 -0500 |
| commit | f6e136e47a6adc176cb53a24cf5a515ca09f977f (patch) | |
| tree | 6ba37c38ba2dd0af4a3f889f7c1f9e88c609f984 /hw/usb/host-linux.c | |
| parent | 879367efba1f2e9733ff76d03041324b5b76f645 (diff) | |
| parent | 98b2d199c109c9eabebb70965db0ae24f3f75a79 (diff) | |
Merge remote-tracking branch 'mjt/trivial-patches-next' into staging
# By Dong Xu Wang (2) and others
# Via Michael Tokarev
* mjt/trivial-patches-next:
osdep.h: include sys/types.h for ssize_t definition
remove double semicolons
clean unnecessary code: don't check g_strdup arg for NULL
docs: mention AddressSpaces in docs/memory.txt
audio: update documentation after removing --audio-card-list option
m25p80.c: Sync Flash chip list with Linux
bsd-user: OS-agnostic 64-bit SYSCTL types
Message-id: 518F61B9.9050803@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/usb/host-linux.c')
| -rw-r--r-- | hw/usb/host-linux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c index 8994668dcd..ca09a891ee 100644 --- a/hw/usb/host-linux.c +++ b/hw/usb/host-linux.c @@ -651,7 +651,7 @@ static void usb_host_handle_reset(USBDevice *dev) trace_usb_host_reset(s->bus_num, s->addr); - usb_host_do_reset(s);; + usb_host_do_reset(s); usb_host_claim_interfaces(s, 0); usb_linux_update_endp_table(s); @@ -1429,7 +1429,7 @@ static void usb_host_exit_notifier(struct Notifier *n, void *data) usb_host_release_port(s); if (s->fd != -1) { - usb_host_do_reset(s);; + usb_host_do_reset(s); } } |