diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-08 08:57:33 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-08 08:57:33 -0500 |
| commit | a60fce0bcc193c37c92972b8217341d81f7a9860 (patch) | |
| tree | 57f7977faa534d05d969d5e4a23154d8381866ae /hw/usb-ohci.c | |
| parent | 63236c15e93e18d37ce657171a42af1f809d0aa6 (diff) | |
| parent | 5b1cdb4ead0b3d2190492fce0a17e809ef915f26 (diff) | |
| download | focaccia-qemu-a60fce0bcc193c37c92972b8217341d81f7a9860.tar.gz focaccia-qemu-a60fce0bcc193c37c92972b8217341d81f7a9860.zip | |
Merge remote-tracking branch 'kraxel/usb.26' into staging
Diffstat (limited to 'hw/usb-ohci.c')
| -rw-r--r-- | hw/usb-ohci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c index d30db3f92f..503ca2d31f 100644 --- a/hw/usb-ohci.c +++ b/hw/usb-ohci.c @@ -448,8 +448,8 @@ static void ohci_reset(void *opaque) { port = &ohci->rhport[i]; port->ctrl = 0; - if (port->port.dev) { - usb_attach(&port->port, port->port.dev); + if (port->port.dev && port->port.dev->attached) { + usb_attach(&port->port); } } if (ohci->async_td) { |