diff --git a/devicemodel/hw/pci/xhci.c b/devicemodel/hw/pci/xhci.c
index 0f7b5a221..b9322d8b4 100644
--- a/devicemodel/hw/pci/xhci.c
+++ b/devicemodel/hw/pci/xhci.c
@@ -2088,6 +2088,7 @@ pci_xhci_cmd_address_device(struct pci_xhci_vdev *xdev,
 			UPRINTF(LFTL, "fail to create device for %d-%s\r\n",
 					di->path.bus,
 					usb_dev_path(&di->path));
+			cmderr = XHCI_TRB_ERROR_XACT;
 			goto done;
 		}
 
diff --git a/devicemodel/hw/platform/usb_pmapper.c b/devicemodel/hw/platform/usb_pmapper.c
index a18199bb8..96a98cb53 100644
--- a/devicemodel/hw/platform/usb_pmapper.c
+++ b/devicemodel/hw/platform/usb_pmapper.c
@@ -1067,6 +1067,7 @@ usb_dev_init(void *pdata, char *opt)
 		goto errout;
 
 	switch (desc.bcdUSB) {
+	case 0x320:
 	case 0x310:
 	case 0x300:
 		ver = 3; break;