From 7107334391d05bd60a44daaee732c19860ca87bc Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 10 Sep 2015 23:22:43 +0100 Subject: [efi] Provide efi_devpath_len() Signed-off-by: Michael Brown --- src/drivers/usb/usbio.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/drivers/usb') diff --git a/src/drivers/usb/usbio.c b/src/drivers/usb/usbio.c index a80f7c8fc..2c15200ce 100644 --- a/src/drivers/usb/usbio.c +++ b/src/drivers/usb/usbio.c @@ -1492,15 +1492,14 @@ static int usbio_path ( struct usbio_device *usbio ) { path = u.interface; /* Locate end of device path and sanity check */ - end = efi_devpath_end ( path ); - len = ( ( ( void * ) end ) - ( ( void * ) path ) ); + len = efi_devpath_len ( path ); if ( len < sizeof ( *usbpath ) ) { DBGC ( usbio, "USBIO %s underlength device path\n", efi_handle_name ( handle ) ); rc = -EINVAL; goto err_underlength; } - usbpath = ( ( ( void * ) end ) - sizeof ( *usbpath ) ); + usbpath = ( ( ( void * ) path ) + len - sizeof ( *usbpath ) ); if ( ! ( ( usbpath->Header.Type == MESSAGING_DEVICE_PATH ) && ( usbpath->Header.SubType == MSG_USB_DP ) ) ) { DBGC ( usbio, "USBIO %s not a USB device path: ", -- cgit v1.2.3-55-g7522