Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0ec0652 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/iommu-debug:: initialize variables before use"

parents 622c3266 c00966d0

drivers/iommu/io-pgtable-fast.c

+3 −0
Original line number Diff line number Diff line
@@ -424,6 +424,9 @@ av8l_fast_alloc_pgtable(struct io_pgtable_cfg *cfg, void *cookie) 
	struct av8l_fast_io_pgtable *data =

		av8l_fast_alloc_pgtable_data(cfg);



	if (!data)

		return NULL;



	/* restrict according to the fast map requirements */

	cfg->ias = 32;

	cfg->pgsize_bitmap = SZ_4K;

drivers/iommu/iommu-debug.c

+2 −2
Original line number Diff line number Diff line
@@ -1378,7 +1378,7 @@ static int __apply_to_new_mapping(struct seq_file *s, 
	struct dma_iommu_mapping *mapping;

	struct iommu_debug_device *ddev = s->private;

	struct device *dev = ddev->dev;

	int ret, fast = 1;

	int ret = -EINVAL, fast = 1;

	phys_addr_t pt_phys;



	mapping = arm_iommu_create_mapping(&platform_bus_type, 0, SZ_1G * 4ULL);
@@ -1683,7 +1683,7 @@ static const struct file_operations iommu_debug_atos_fops = { 
static ssize_t iommu_debug_map_write(struct file *file, const char __user *ubuf,

				     size_t count, loff_t *offset)

{

	ssize_t retval;

	ssize_t retval = -EINVAL;

	int ret;

	char *comma1, *comma2, *comma3;

	char buf[100];