Unverified Commit 94125b27 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11800 can: mcp251x: fix deadlock if an interrupt occurs during mcp251x_open 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Changzhong <zhangchangzhong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/E46Q3WJWZTPK57SRPYSSKFMZTRGLFQMP/ 
 
https://gitee.com/src-openeuler/kernel/issues/IARWQI 
 
Link:https://gitee.com/openeuler/kernel/pulls/11800

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 04ff9f5a 3af24479

drivers/net/can/spi/mcp251x.c

+1 −1
Original line number Diff line number Diff line
@@ -755,7 +755,7 @@ static int mcp251x_hw_wake(struct spi_device *spi) 
	int ret;



	/* Force wakeup interrupt to wake device, but don't execute IST */

	disable_irq(spi->irq);

	disable_irq_nosync(spi->irq);

	mcp251x_write_2regs(spi, CANINTE, CANINTE_WAKIE, CANINTF_WAKIF);



	/* Wait for oscillator startup timer after wake up */