diff --git a/mbed_lstools/linux.py b/mbed_lstools/linux.py
index ca78d57..a5eada5 100644
--- a/mbed_lstools/linux.py
+++ b/mbed_lstools/linux.py
@@ -47,7 +47,7 @@ def __init__(self, **kwargs):
             r'(pci|usb)-[0-9a-zA-Z_-]*_(?P<usbid>[0-9a-zA-Z]*)-.*$')
         self.mmp = re.compile(
             r'(?P<dev>(/[^/ ]*)+) on (?P<dir>(/[^/ ]*)+) ')
-        self.udp = re.compile(r'[0-9]+-[0-9]+')
+        self.udp = re.compile(r'^[0-9]+-[0-9]+[^:\s]*$')
 
     def find_candidates(self):
         disk_ids = self._dev_by_id('disk')
@@ -126,7 +126,6 @@ def _sysfs_block_devices(self, block_devices):
             for index, part in enumerate(path_parts):
                 if self.udp.search(part):
                     end_index = index
-                    break
 
             if end_index == None:
                 logger.debug('Did not find suitable usb folder for usb info: %s', full_sysfs_path)
diff --git a/test/os_linux_generic.py b/test/os_linux_generic.py
index e803808..7aa3558 100644
--- a/test/os_linux_generic.py
+++ b/test/os_linux_generic.py
@@ -142,7 +142,7 @@ def do_abspath(dir):
             'sdf',
             'sdg'
         ],
-        '/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-2': [
+        '/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-1/1-1.2/1-1.2.6': [
             'idVendor',
             'idProduct'
         ],
@@ -169,8 +169,8 @@ def do_abspath(dir):
     }
 
     open_dict_rpi = {
-        '/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-2/idVendor': '0d28\n',
-        '/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-2/idProduct': '0204\n',
+        '/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-1/1-1.2/1-1.2.6/idVendor': '0d28\n',
+        '/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-1/1-1.2/1-1.2.6/idProduct': '0204\n',
         '/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-3/idVendor': '0d28\n',
         '/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-3/idProduct': '0204\n',
         '/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-4/idVendor': '0d28\n',
@@ -194,7 +194,7 @@ def do_abspath(dir):
         '/dev/serial/by-id/usb-ARM_DAPLink_CMSIS-DAP_0240000028884e450018700f6bf000338021000097969900-if01': '../../ttyACM1',
         '/dev/serial/by-id/usb-ARM_DAPLink_CMSIS-DAP_0240000028884e450036700f6bf000118021000097969900-if01': '../../ttyACM3',
         '/dev/serial/by-id/usb-ARM_DAPLink_CMSIS-DAP_0240000029164e45001b0012706e000df301000097969900-if01': '../../ttyACM2',
-        '/sys/class/block/sdb': '../../devices/pci0000:00/0000:00:06.0/usb1/1-2/1-2:1.0/host3/target3:0:0/3:0:0:0/block/sdb',
+        '/sys/class/block/sdb': '../../devices/pci0000:00/0000:00:06.0/usb1/1-1/1-1.2/1-1.2.6/1-1.2.6:1.0/host8568/target8568:0:0/8568:0:0:0/block/sdb',
         '/sys/class/block/sdc': '../../devices/pci0000:00/0000:00:06.0/usb1/1-3/1-3:1.0/host4/target4:0:0/4:0:0:0/block/sdc',
         '/sys/class/block/sdd': '../../devices/pci0000:00/0000:00:06.0/usb1/1-4/1-4:1.0/host5/target5:0:0/5:0:0:0/block/sdd',
         '/sys/class/block/sde': '../../devices/pci0000:00/0000:00:06.0/usb1/1-5/1-5:1.0/host6/target6:0:0/6:0:0:0/block/sde',