From 2f2ee2689ffe8a784a86bf10fb946772748632c7 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 24 Oct 2012 18:31:06 +0200 Subject: uhci: cleanup: Add an unlink call to uhci_async_cancel() All callers of uhci_async_cancel() call uhci_async_unlink() first, so lets move the unlink call to uhci_async_cancel() Signed-off-by: Hans de Goede Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-uhci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'hw/usb/hcd-uhci.c') diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 129792b662..82dd5c2358 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -232,6 +232,7 @@ static void uhci_async_unlink(UHCIAsync *async) static void uhci_async_cancel(UHCIAsync *async) { + uhci_async_unlink(async); trace_usb_uhci_packet_cancel(async->queue->token, async->td, async->done); if (!async->done) usb_cancel_packet(&async->packet); @@ -266,7 +267,6 @@ static void uhci_async_validate_end(UHCIState *s) } while (!QTAILQ_EMPTY(&queue->asyncs)) { async = QTAILQ_FIRST(&queue->asyncs); - uhci_async_unlink(async); uhci_async_cancel(async); } uhci_queue_free(queue); @@ -284,7 +284,6 @@ static void uhci_async_cancel_device(UHCIState *s, USBDevice *dev) curr->packet.ep->dev != dev) { continue; } - uhci_async_unlink(curr); uhci_async_cancel(curr); } } @@ -297,7 +296,6 @@ static void uhci_async_cancel_all(UHCIState *s) QTAILQ_FOREACH_SAFE(queue, &s->queues, next, nq) { QTAILQ_FOREACH_SAFE(curr, &queue->asyncs, next, n) { - uhci_async_unlink(curr); uhci_async_cancel(curr); } uhci_queue_free(queue); -- cgit v1.2.1