From ea3cee9424ef12e8f1d6dda411efef4488f98936 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 3 Jun 2019 13:45:48 +0200 Subject: [PATCH 5/9] usb: call reset handler before updating state MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Gerd Hoffmann Message-id: <20190603134550.30153-3-kraxel@redhat.com> Patchwork-id: 88447 O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 2/4] usb: call reset handler before updating state Bugzilla: 1710861 RH-Acked-by: Philippe Mathieu-Daudé RH-Acked-by: Dr. David Alan Gilbert RH-Acked-by: Max Reitz RH-Acked-by: Miroslav Rezanina That way the device reset handler can see what the before-reset state of the device is. Signed-off-by: Gerd Hoffmann Message-id: 20190522094702.17619-2-kraxel@redhat.com (cherry picked from commit 7ed4657396add28382081a15557c78cd480c1cf1) Signed-off-by: Miroslav Rezanina --- hw/usb/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/core.c b/hw/usb/core.c index 241ae66..07b67fb 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -87,10 +87,10 @@ void usb_device_reset(USBDevice *dev) if (dev == NULL || !dev->attached) { return; } + usb_device_handle_reset(dev); dev->remote_wakeup = 0; dev->addr = 0; dev->state = USB_STATE_DEFAULT; - usb_device_handle_reset(dev); } void usb_wakeup(USBEndpoint *ep, unsigned int stream) -- 1.8.3.1