sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix deadlock when closing the MCAN device driver

Browse Source
This commit is contained in:
Gregory Nutt 2015-08-17 11:49:20 -06:00
parent 4f122d5290
commit 531456d20c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/src/samv7/sam_mcan.c
View File

@ -2215,19 +2215,24 @@ static void mcan_shutdown(FAR struct can_dev_s *dev)
mcan_dev_lock(priv);
/* Disable the MCAN interrupts */
/* Disable MCAN interrupts at the NVIC */
up_disable_irq(config->irq0);
up_disable_irq(config->irq1);
/* Disable all interrupts from the MCAN peripheral */
mcan_putreg(priv, SAM_MCAN_IE_OFFSET, 0);
mcan_putreg(priv, SAM_MCAN_TXBTIE_OFFSET, 0);
/* Detach the MCAN interrupt handler */
irq_detach(config->irq0);
irq_detach(config->irq1);
/* And reset the hardware */
/* Disable peripheral clocking to the MCAN controller */
mcan_reset(dev);
sam_disableperiph1(priv->config->pid);
mcan_dev_unlock(priv);
}