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

Commit 24db953e authored by Pi-Hsun Shih's avatar Pi-Hsun Shih Committed by Alexandre Belloni
Browse files

rtc: mt6397: Don't call irq_dispose_mapping. 



The IRQ mapping was changed to not being created in the rtc-mt6397
driver, so the irq_dispose_mapping is no longer needed.
Also the dev_id passed to free_irq should be the same as the last
argument passed to request_threaded_irq.
This prevents a "Trying to free already-free IRQ 274" warning when
unbinding the driver.

Fixes: e695d3a0 ("mfd: mt6397: Create irq mappings in mfd core driver")
Signed-off-by: default avatarPi-Hsun Shih <pihsun@chromium.org>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent fd86b2d4

drivers/rtc/rtc-mt6397.c

+3 −6
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static int mtk_rtc_probe(struct platform_device *pdev) 
	if (ret) {

		dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n",

			rtc->irq, ret);

		goto out_dispose_irq;

		return ret;

	}



	device_init_wakeup(&pdev->dev, 1);
@@ -359,9 +359,7 @@ static int mtk_rtc_probe(struct platform_device *pdev) 
	return 0;



out_free_irq:

	free_irq(rtc->irq, rtc->rtc_dev);

out_dispose_irq:

	irq_dispose_mapping(rtc->irq);

	free_irq(rtc->irq, rtc);

	return ret;

}
@@ -369,8 +367,7 @@ static int mtk_rtc_remove(struct platform_device *pdev) 
{

	struct mt6397_rtc *rtc = platform_get_drvdata(pdev);



	free_irq(rtc->irq, rtc->rtc_dev);

	irq_dispose_mapping(rtc->irq);

	free_irq(rtc->irq, rtc);



	return 0;

}