diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2011-06-24 12:31:11 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2011-07-05 15:09:02 +0200 |
| commit | 4706ab6cc0af86d3f38806664420cc3eb8999bd9 (patch) | |
| tree | 53ca1a3df6c81e2eb309b431f01825496ea4692a /hw/usb-bus.c | |
| parent | d47e59b8b8adc96a2052f7e004cb12b6ff62edd9 (diff) | |
usb: Replace device_destroy bus op with a child_detach port op
Note this fixes 2 things in one go, first of all the device_destroy bus
op should be a device_detach bus op, as pending async packets from the
device should be cancelled on detach not on destroy.
Secondly having this as a bus op won't work with companion controllers, since
then there will be 1 bus driven by the ehci controller and thus 1 set of bus
ops, but the device being detached may be downstream of a handed over port.
Making the detach of a downstream device a port op allows the ehci controller
to forward this to the companion controller port for handed over ports.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb-bus.c')
| -rw-r--r-- | hw/usb-bus.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/usb-bus.c b/hw/usb-bus.c index b511bac41..c8347e9e3 100644 --- a/hw/usb-bus.c +++ b/hw/usb-bus.c @@ -82,12 +82,10 @@ static int usb_qdev_init(DeviceState *qdev, DeviceInfo *base) static int usb_qdev_exit(DeviceState *qdev) { USBDevice *dev = DO_UPCAST(USBDevice, qdev, qdev); - USBBus *bus = usb_bus_from_device(dev); if (dev->attached) { usb_device_detach(dev); } - bus->ops->device_destroy(bus, dev); if (dev->info->handle_destroy) { dev->info->handle_destroy(dev); } |