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

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

Merge "soc: qcom: glink: qmp: Remove IRQF_NO_SUSPEND"

parents 79d6c6bd dc33e3aa

drivers/mailbox/msm_qmp.c

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

/* Copyright (c) 2017-2018, 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
@@ -893,7 +893,7 @@ static int qmp_mbox_probe(struct platform_device *pdev) 
								mdev->name);



	ret = devm_request_irq(&pdev->dev, mdev->rx_irq_line, qmp_irq_handler,

		IRQF_TRIGGER_RISING | IRQF_NO_SUSPEND | IRQF_SHARED,

		IRQF_TRIGGER_RISING | IRQF_SHARED,

		edge_node->name, mdev);

	if (ret < 0) {

		qmp_mbox_remove(pdev);

drivers/soc/qcom/glink_smem_native_xprt.c

+1 −1
Original line number Diff line number Diff line
@@ -2548,7 +2548,7 @@ static int glink_smem_native_probe(struct platform_device *pdev) 


	einfo->irq_line = irq_line;

	rc = request_irq(irq_line, irq_handler,

			IRQF_TRIGGER_RISING | IRQF_NO_SUSPEND | IRQF_SHARED,

			IRQF_TRIGGER_RISING | IRQF_SHARED,

			node->name, einfo);

	if (rc < 0) {

		pr_err("%s: request_irq on %d failed: %d\n", __func__, irq_line,