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

Commit 1c5625cf authored by Phil Sutter's avatar Phil Sutter Committed by David S. Miller
Browse files

korina: do not use IRQF_SHARED with IRQF_DISABLED 



As the kernel warning states: "IRQF_DISABLED is not guaranteed on shared
IRQs". Since these IRQs' values are hardcoded and my test system doesn't
show any shared use of IRQs at all, rather make them non-shared than
non-disabled.

Signed-off-by: default avatarPhil Sutter <n0-1@freewrt.org>
Acked-by: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5edc7668

drivers/net/korina.c

+4 −4
Original line number Diff line number Diff line
@@ -1000,14 +1000,14 @@ static int korina_open(struct net_device *dev) 
	 * that handles the Done Finished

	 * Ovr and Und Events */

	ret = request_irq(lp->rx_irq, &korina_rx_dma_interrupt,

		IRQF_SHARED | IRQF_DISABLED, "Korina ethernet Rx", dev);

			IRQF_DISABLED, "Korina ethernet Rx", dev);

	if (ret < 0) {

		printk(KERN_ERR DRV_NAME "%s: unable to get Rx DMA IRQ %d\n",

		    dev->name, lp->rx_irq);

		goto err_release;

	}

	ret = request_irq(lp->tx_irq, &korina_tx_dma_interrupt,

		IRQF_SHARED | IRQF_DISABLED, "Korina ethernet Tx", dev);

			IRQF_DISABLED, "Korina ethernet Tx", dev);

	if (ret < 0) {

		printk(KERN_ERR DRV_NAME "%s: unable to get Tx DMA IRQ %d\n",

		    dev->name, lp->tx_irq);
@@ -1016,7 +1016,7 @@ static int korina_open(struct net_device *dev) 


	/* Install handler for overrun error. */

	ret = request_irq(lp->ovr_irq, &korina_ovr_interrupt,

			IRQF_SHARED | IRQF_DISABLED, "Ethernet Overflow", dev);

			IRQF_DISABLED, "Ethernet Overflow", dev);

	if (ret < 0) {

		printk(KERN_ERR DRV_NAME"%s: unable to get OVR IRQ %d\n",

		    dev->name, lp->ovr_irq);
@@ -1025,7 +1025,7 @@ static int korina_open(struct net_device *dev) 


	/* Install handler for underflow error. */

	ret = request_irq(lp->und_irq, &korina_und_interrupt,

			IRQF_SHARED | IRQF_DISABLED, "Ethernet Underflow", dev);

			IRQF_DISABLED, "Ethernet Underflow", dev);

	if (ret < 0) {

		printk(KERN_ERR DRV_NAME "%s: unable to get UND IRQ %d\n",

		    dev->name, lp->und_irq);