|
@@ -929,6 +929,7 @@ static int mcp251x_open(struct net_device *net)
|
|
|
struct mcp251x_priv *priv = netdev_priv(net);
|
|
|
struct spi_device *spi = priv->spi;
|
|
|
struct mcp251x_platform_data *pdata = spi->dev.platform_data;
|
|
|
+ unsigned long flags;
|
|
|
int ret;
|
|
|
|
|
|
ret = open_candev(net);
|
|
@@ -945,9 +946,14 @@ static int mcp251x_open(struct net_device *net)
|
|
|
priv->tx_skb = NULL;
|
|
|
priv->tx_len = 0;
|
|
|
|
|
|
+ flags = IRQF_ONESHOT;
|
|
|
+ if (pdata->irq_flags)
|
|
|
+ flags |= pdata->irq_flags;
|
|
|
+ else
|
|
|
+ flags |= IRQF_TRIGGER_FALLING;
|
|
|
+
|
|
|
ret = request_threaded_irq(spi->irq, NULL, mcp251x_can_ist,
|
|
|
- pdata->irq_flags ? pdata->irq_flags : IRQF_TRIGGER_FALLING,
|
|
|
- DEVICE_NAME, priv);
|
|
|
+ flags, DEVICE_NAME, priv);
|
|
|
if (ret) {
|
|
|
dev_err(&spi->dev, "failed to acquire irq %d\n", spi->irq);
|
|
|
if (pdata->transceiver_enable)
|