1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/xen/arm-device.c b/drivers/xen/arm-device.c
index 778acf80aacb..85dd20e05726 100644
--- a/drivers/xen/arm-device.c
+++ b/drivers/xen/arm-device.c
@@ -58,9 +58,13 @@ static int xen_map_device_mmio(const struct resource *resources,
         xen_pfn_t *gpfns;
         xen_ulong_t *idxs;
         int *errs;
-        struct xen_add_to_physmap_range xatp;
 
         for (i = 0; i < count; i++) {
+                struct xen_add_to_physmap_range xatp = {
+                        .domid = DOMID_SELF,
+                        .space = XENMAPSPACE_dev_mmio
+                };
+
                 r = &resources[i];
                 nr = DIV_ROUND_UP(resource_size(r), XEN_PAGE_SIZE);
                 if ((resource_type(r) != IORESOURCE_MEM) || (nr == 0))
@@ -87,9 +91,7 @@ static int xen_map_device_mmio(const struct resource *resources,
                         idxs[j] = XEN_PFN_DOWN(r->start) + j;
                 }
 
-                xatp.domid = DOMID_SELF;
                 xatp.size = nr;
-                xatp.space = XENMAPSPACE_dev_mmio;
 
                 set_xen_guest_handle(xatp.gpfns, gpfns);
                 set_xen_guest_handle(xatp.idxs, idxs);