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

Commit dd008f12 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: npu: Continue npu_probe() when !DEBUG_FS"

parents dabbb9d3 200e176a

drivers/media/platform/msm/npu/npu_dev.c

+2 −4
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -2314,9 +2314,7 @@ static int npu_probe(struct platform_device *pdev) 
	if (rc)

	if (rc)

		goto error_driver_init;

		goto error_driver_init;





	rc = npu_debugfs_init(npu_dev);

	npu_debugfs_init(npu_dev);

	if (rc)

		goto error_driver_init;





	npu_dev->smmu_ctx.attach_cnt = 0;

	npu_dev->smmu_ctx.attach_cnt = 0;

	npu_dev->smmu_ctx.mmu_mapping = arm_iommu_create_mapping(

	npu_dev->smmu_ctx.mmu_mapping = arm_iommu_create_mapping(