diff --git a/payloads/libpayload/drivers/usb/xhci.c b/payloads/libpayload/drivers/usb/xhci.c
index 2f61f8658a..ef1d73ff68 100644
--- a/payloads/libpayload/drivers/usb/xhci.c
+++ b/payloads/libpayload/drivers/usb/xhci.c
@@ -185,15 +185,15 @@ xhci_init (unsigned long physical_bar)
 		goto _free_xhci;
 	}
 
-	memcpy(&xhci->capreg, phys_to_virt(physical_bar), sizeof(xhci->capreg));
+	xhci->capreg = phys_to_virt(physical_bar) + sizeof(xhci->capreg);
 	xhci->opreg = phys_to_virt(physical_bar) + CAP_GET(CAPLEN, xhci->capreg);
-	xhci->hcrreg = phys_to_virt(physical_bar) + xhci->capreg.rtsoff;
-	xhci->dbreg = phys_to_virt(physical_bar) + xhci->capreg.dboff;
+	xhci->hcrreg = phys_to_virt(physical_bar) + xhci->capreg->rtsoff;
+	xhci->dbreg = phys_to_virt(physical_bar) + xhci->capreg->dboff;
 
 	xhci_debug("regbase: 0x%"PRIx32"\n", physical_bar);
 	xhci_debug("caplen:  0x%"PRIx32"\n", CAP_GET(CAPLEN, xhci->capreg));
-	xhci_debug("rtsoff:  0x%"PRIx32"\n", xhci->capreg.rtsoff);
-	xhci_debug("dboff:   0x%"PRIx32"\n", xhci->capreg.dboff);
+	xhci_debug("rtsoff:  0x%"PRIx32"\n", xhci->capreg->rtsoff);
+	xhci_debug("dboff:   0x%"PRIx32"\n", xhci->capreg->dboff);
 
 	xhci_debug("hciversion: %"PRIx8".%"PRIx8"\n",
 		   CAP_GET(CAPVER_HI, xhci->capreg), CAP_GET(CAPVER_LO, xhci->capreg));
diff --git a/payloads/libpayload/drivers/usb/xhci_private.h b/payloads/libpayload/drivers/usb/xhci_private.h
index 65c3fdd6cc..0264f1f218 100644
--- a/payloads/libpayload/drivers/usb/xhci_private.h
+++ b/payloads/libpayload/drivers/usb/xhci_private.h
@@ -364,7 +364,7 @@ typedef struct erst_entry {
 #define CAP_CSZ_LEN			1
 
 #define CAP_MASK(tok)		MASK(CAP_##tok##_START, CAP_##tok##_LEN)
-#define CAP_GET(tok, cap)	(((cap).CAP_##tok##_FIELD & CAP_MASK(tok)) \
+#define CAP_GET(tok, cap)	(((cap)->CAP_##tok##_FIELD & CAP_MASK(tok)) \
 				 >> CAP_##tok##_START)
 
 #define CTXSIZE(xhci) (CAP_GET(CSZ, (xhci)->capreg) ? 64 : 32)
@@ -378,7 +378,7 @@ typedef struct xhci {
 		u32 hccparams;
 		u32 dboff;
 		u32 rtsoff;
-	} __packed capreg;
+	} __packed *capreg;
 
 	/* opreg is R/W is most places, so volatile access is necessary.
 	   volatile means that the compiler seeks byte writes if possible,