From 87e043f17e9b3781b3c29c02ff32abc23ac15708 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 10 Jan 2012 17:59:33 +0100 Subject: [PATCH] usb-musb: switch to usb_find_device() Switch over musb to use the new usb_find_device() function for device lookup. Signed-off-by: Gerd Hoffmann --- hw/usb-musb.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/usb-musb.c b/hw/usb-musb.c index c2753c984c..ecac631228 100644 --- a/hw/usb-musb.c +++ b/hw/usb-musb.c @@ -605,6 +605,7 @@ static int musb_timeout(int ttype, int speed, int val) static void musb_packet(MUSBState *s, MUSBEndPoint *ep, int epnum, int pid, int len, USBCallback cb, int dir) { + USBDevice *dev; int ret; int idx = epnum && dir; int ttype; @@ -628,10 +629,8 @@ static void musb_packet(MUSBState *s, MUSBEndPoint *ep, ep->packey[dir].ep = ep; ep->packey[dir].dir = dir; - if (s->port.dev) - ret = usb_handle_packet(s->port.dev, &ep->packey[dir].p); - else - ret = USB_RET_NODEV; + dev = usb_find_device(&s->port, ep->packey[dir].p.devaddr); + ret = usb_handle_packet(dev, &ep->packey[dir].p); if (ret == USB_RET_ASYNC) { ep->status[dir] = len;