Merge branch 'topic/ste' into for-linus (62ddae37) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/dma/ste_dma40.c

+42 −45

Original line number	Diff line number	Diff line
		@@ -3543,8 +3543,8 @@ static int __init d40_probe(struct platform_device *pdev)
		struct stedma40_platform_data *plat_data = dev_get_platdata(&pdev->dev);
		struct device_node *np = pdev->dev.of_node;
		int ret = -ENOENT;
		struct d40_base *base = NULL;
		struct resource *res = NULL;
		struct d40_base *base;
		struct resource *res;
		int num_reserved_chans;
		u32 val;

		@@ -3552,17 +3552,17 @@ static int __init d40_probe(struct platform_device *pdev)
		if (np) {
		if (d40_of_probe(pdev, np)) {
		ret = -ENOMEM;
		goto failure;
		goto report_failure;
		}
		} else {
		d40_err(&pdev->dev, "No pdata or Device Tree provided\n");
		goto failure;
		goto report_failure;
		}
		}

		base = d40_hw_detect_init(pdev);
		if (!base)
		goto failure;
		goto report_failure;

		num_reserved_chans = d40_phy_res_init(base);

		@@ -3693,8 +3693,6 @@ static int __init d40_probe(struct platform_device *pdev)
		return 0;

		failure:
		if (base) {
		if (base->desc_slab)
		kmem_cache_destroy(base->desc_slab);
		if (base->virtbase)
		iounmap(base->virtbase);
		@@ -3736,8 +3734,7 @@ static int __init d40_probe(struct platform_device *pdev)
		kfree(base->lookup_phy_chans);
		kfree(base->phy_res);
		kfree(base);
		}

		report_failure:
		d40_err(&pdev->dev, "probe failed\n");
		return ret;
		}