Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[karo-tx-linux.git] / drivers / of / of_reserved_mem.c

diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index 366d8c3c79893b04261644f8064266b8e41be82e..d507c3569a88acac9e796f1f172f412e5386347f 100644 (file)
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -354,6 +354,10 @@ int of_reserved_mem_device_init_by_idx(struct device *dev,
                mutex_lock(&of_rmem_assigned_device_mutex);
                list_add(&rd->list, &of_rmem_assigned_device_list);
                mutex_unlock(&of_rmem_assigned_device_mutex);
+               /* ensure that dma_ops is set for virtual devices
+                * using reserved memory
+                */
+               of_dma_configure(dev, np);
 
                dev_info(dev, "assigned reserved memory node %s\n", rmem->name);
        } else {