Changeset 5dad73d in mainline for uspace/lib/usbhost/src/ddf_helpers.c

Timestamp:

2013-08-20T12:23:03Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0ee999d

Parents:

fa9d3af

Message:

libusbhost: Fix accessing NULL pointer

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (2 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -331 +331 @@
         fibril_mutex_initialize(&info->guard);
 
-        if (hub_dev->speed == USB_SPEED_HIGH && usb_speed_is_11(speed))
+        if (hub_dev && hub_dev->speed == USB_SPEED_HIGH && usb_speed_is_11(speed))
                 info->tt_address = hub_dev->address;
 
@@ -570 +570 @@
         assert(hcd);
 
-        const usb_speed_t speed = hcd->ep_manager.max_speed;
-
-        hcd_reserve_default_address(hcd, speed);
+        hcd_reserve_default_address(hcd, hcd->ep_manager.max_speed);
         const int ret = hcd_ddf_new_device(device, NULL, 0);
         hcd_release_default_address(hcd);