Changeset 7aaed09 in mainline for uspace/lib/usb/src/resolve.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/usb/src/resolve.c (modified) (1 diff)

uspace/lib/usb/src/resolve.c

@@ -200 +200 @@
                 /* Try to get its address. */
                 if (!found_addr) {
-                        dev_addr = usb_hc_get_address_by_handle(tmp_handle);
+                        dev_addr = usb_get_address_by_handle(tmp_handle);
                         if (dev_addr >= 0) {
                                 found_addr = true;