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

Commit 0ead05f7 authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

memory: emif: Add check for setup_interrupts 



[ Upstream commit fd7bd80b46373887b390852f490f21b07e209498 ]

As the potential failure of the devm_request_threaded_irq(),
it should be better to check the return value of the
setup_interrupts() and return error if fails.

Fixes: 68b4aee3 ("memory: emif: add interrupt and temperature handling")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20220224025444.3256530-1-jiasheng@iscas.ac.cn


Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 68a69ad8

drivers/memory/emif.c

+4 −2
Original line number Diff line number Diff line
@@ -1515,7 +1515,7 @@ static int __init_or_module emif_probe(struct platform_device *pdev) 
{

	struct emif_data	*emif;

	struct resource		*res;

	int			irq;

	int			irq, ret;



	if (pdev->dev.of_node)

		emif = of_get_memory_device_details(pdev->dev.of_node, &pdev->dev);
@@ -1549,7 +1549,9 @@ static int __init_or_module emif_probe(struct platform_device *pdev) 
	emif_onetime_settings(emif);

	emif_debugfs_init(emif);

	disable_and_clear_all_interrupts(emif);

	setup_interrupts(emif, irq);

	ret = setup_interrupts(emif, irq);

	if (ret)

		goto error;



	/* One-time actions taken on probing the first device */

	if (!emif1) {