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

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

Merge "iommu: msm: Remove IRQF_TRIGGER_RISING flag while registering interrupt"

parents f7bb6fa0 ad2f3d46

drivers/iommu/msm_iommu_dev-v1.c

+3 −5
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

 *

 * 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
@@ -461,8 +461,7 @@ static int msm_iommu_probe(struct platform_device *pdev) 
		ret = devm_request_threaded_irq(&pdev->dev, global_cfg_irq,

				NULL,

				msm_iommu_global_fault_handler,

				IRQF_ONESHOT | IRQF_SHARED |

				IRQF_TRIGGER_RISING,

				IRQF_ONESHOT | IRQF_SHARED,

				"msm_iommu_global_cfg_irq", pdev);

		if (ret < 0)

			pr_err("Request Global CFG IRQ %d failed with ret=%d\n",
@@ -475,8 +474,7 @@ static int msm_iommu_probe(struct platform_device *pdev) 
		ret = devm_request_threaded_irq(&pdev->dev, global_client_irq,

				NULL,

				msm_iommu_global_fault_handler,

				IRQF_ONESHOT | IRQF_SHARED |

				IRQF_TRIGGER_RISING,

				IRQF_ONESHOT | IRQF_SHARED,

				"msm_iommu_global_client_irq", pdev);

		if (ret < 0)

			pr_err("Request Global Client IRQ %d failed with ret=%d\n",