2 files changed, 5 insertions, 4 deletions

diff --git a/sys/dev/xdma/xdma.c b/sys/dev/xdma/xdma.c
index 7de64ae981b9..cd3646a0e3d9 100644
--- a/sys/dev/xdma/xdma.c
+++ b/sys/dev/xdma/xdma.c
@@ -412,7 +412,7 @@ xdma_prep_memcpy(xdma_channel_t *xchan, uintptr_t src_addr,
 	if (ret != 0) {
 		device_printf(xdma->dev,
 		    "%s: Can't prepare memcpy transfer.\n", __func__);
-		XDMA_UNLOCK();
+		XCHAN_UNLOCK(xchan);
 
 		return (-1);
 	}
@@ -460,7 +460,8 @@ xdma_prep_cyclic(xdma_channel_t *xchan, enum xdma_direction dir,
 	if (ret != 0) {
 		device_printf(xdma->dev,
 		    "%s: Can't prepare cyclic transfer.\n", __func__);
-		XDMA_UNLOCK();
+		XCHAN_UNLOCK(xchan);
+
 		return (-1);
 	}
 
diff --git a/sys/dev/xdma/xdma.h b/sys/dev/xdma/xdma.h
index d4638e75c3fa..48fbf676be81 100644
--- a/sys/dev/xdma/xdma.h
+++ b/sys/dev/xdma/xdma.h
@@ -77,8 +77,8 @@ struct xdma_channel_config {
 typedef struct xdma_channel_config xdma_config_t;
 
 struct xdma_descriptor {
-	uintptr_t	ds_addr;
-	uint32_t	ds_len;
+	bus_addr_t	ds_addr;
+	bus_size_t	ds_len;
 };
 
 typedef struct xdma_descriptor xdma_descriptor_t;