diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-29 09:11:00 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-29 09:11:00 -0600 |
commit | 5ca2358ac895139e624881c5b3bf3095d3cc4515 (patch) | |
tree | 18e75a6cf6e88a72a972f0a488da42753a2f0f1c /usb-linux.c | |
parent | b55c952aea6de024bf1a06357b49367fba045443 (diff) | |
parent | 3741715cf2e54727fe3d9884ea6dcea68c7f7d4b (diff) |
Merge remote-tracking branch 'kraxel/usb.39' into staging
* kraxel/usb.39: (21 commits)
usb: Resolve warnings about unassigned bus on usb device creation
usb-redir: Return USB_RET_NAK when we've no data for an interrupt endpoint
usb-redir: Limit return values returned by iso packets
usb-redir: Let the usb-host know about our device filtering
usb-redir: Always clear device state on filter reject
usb-redir: Fix printing of device version
ehci: drop old stuff
usb-ehci: Handle ISO packets failing with an error other then NAK
libcacard: fix reported ATR length
usb-ccid: advertise SELF_POWERED
libcacard: link with glib for g_strndup
usb-desc: fix user trigerrable segfaults (!config)
usb-ehci: sanity-check iso xfers
usb: add tracepoint for usb packet state changes.
usb-xhci: enable packet queuing
usb-uhci: implement packet queuing
usb-uhci: process uhci_handle_td return code via switch.
usb-uhci: add UHCIQueue
usb-uhci: cleanup UHCIAsync allocation & initialization.
usb-ehci: fix reset
...
Diffstat (limited to 'usb-linux.c')
-rw-r--r-- | usb-linux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usb-linux.c b/usb-linux.c index 24700fc1f..47994f3ce 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -1443,13 +1443,13 @@ static void usb_host_register_types(void) type_init(usb_host_register_types) -USBDevice *usb_host_device_open(const char *devname) +USBDevice *usb_host_device_open(USBBus *bus, const char *devname) { struct USBAutoFilter filter; USBDevice *dev; char *p; - dev = usb_create(NULL /* FIXME */, "usb-host"); + dev = usb_create(bus, "usb-host"); if (strstr(devname, "auto:")) { if (parse_filter(devname, &filter) < 0) { |