forked from Minki/linux
can: flexcan: flexcan_open(): completely initialize controller before requesting IRQ
This patch changes the order in which the flexcan controller is brought up during flexcan_open(). It makes sure that the chip is completely initialized before the IRQs are requested and finally enabled. Link: https://lore.kernel.org/r/20201119100917.3013281-5-mkl@pengutronix.de Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
parent
f3f2a54665
commit
648a34b1d5
@ -1712,32 +1712,33 @@ static int flexcan_open(struct net_device *dev)
|
||||
if (err)
|
||||
goto out_close;
|
||||
|
||||
err = request_irq(dev->irq, flexcan_irq, IRQF_SHARED, dev->name, dev);
|
||||
err = flexcan_rx_offload_setup(dev);
|
||||
if (err)
|
||||
goto out_transceiver_disable;
|
||||
|
||||
err = flexcan_rx_offload_setup(dev);
|
||||
if (err)
|
||||
goto out_free_irq;
|
||||
|
||||
/* start chip and queuing */
|
||||
err = flexcan_chip_start(dev);
|
||||
if (err)
|
||||
goto out_offload_del;
|
||||
goto out_can_rx_offload_del;
|
||||
|
||||
can_rx_offload_enable(&priv->offload);
|
||||
|
||||
err = request_irq(dev->irq, flexcan_irq, IRQF_SHARED, dev->name, dev);
|
||||
if (err)
|
||||
goto out_can_rx_offload_disable;
|
||||
|
||||
flexcan_chip_interrupts_enable(dev);
|
||||
|
||||
can_led_event(dev, CAN_LED_EVENT_OPEN);
|
||||
|
||||
can_rx_offload_enable(&priv->offload);
|
||||
netif_start_queue(dev);
|
||||
|
||||
return 0;
|
||||
|
||||
out_offload_del:
|
||||
out_can_rx_offload_disable:
|
||||
can_rx_offload_disable(&priv->offload);
|
||||
flexcan_chip_stop(dev);
|
||||
out_can_rx_offload_del:
|
||||
can_rx_offload_del(&priv->offload);
|
||||
out_free_irq:
|
||||
free_irq(dev->irq, dev);
|
||||
out_transceiver_disable:
|
||||
flexcan_transceiver_disable(priv);
|
||||
out_close:
|
||||
|
Loading…
Reference in New Issue
Block a user