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

Commit 546e3abd authored by Kulikov Vasiliy's avatar Kulikov Vasiliy Committed by David S. Miller
Browse files

macsonic: free irqs if sonic_open() fails 



macsonic_open() doesn't check sonic_open() return code. If it is error
we must free requested IRQs.

Signed-off-by: default avatarKulikov Vasiliy <segooon@gmail.com>
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 62cd69a1

drivers/net/macsonic.c

+28 −9
Original line number Original line Diff line number Diff line
@@ -140,21 +140,40 @@ static irqreturn_t macsonic_interrupt(int irq, void *dev_id) 




static int macsonic_open(struct net_device* dev)

static int macsonic_open(struct net_device* dev)

{

{

	if (request_irq(dev->irq, sonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) {

	int retval;

		printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);



		return -EAGAIN;

	retval = request_irq(dev->irq, sonic_interrupt, IRQ_FLG_FAST,

				"sonic", dev);

	if (retval) {

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

				dev->name, dev->irq);

		goto err;

	}

	}

	/* Under the A/UX interrupt scheme, the onboard SONIC interrupt comes

	/* Under the A/UX interrupt scheme, the onboard SONIC interrupt comes

	 * in at priority level 3. However, we sometimes get the level 2 inter-

	 * in at priority level 3. However, we sometimes get the level 2 inter-

	 * rupt as well, which must prevent re-entrance of the sonic handler.

	 * rupt as well, which must prevent re-entrance of the sonic handler.

	 */

	 */

	if (dev->irq == IRQ_AUTO_3) {

		retval = request_irq(IRQ_NUBUS_9, macsonic_interrupt,

					IRQ_FLG_FAST, "sonic", dev);

		if (retval) {

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

					dev->name, IRQ_NUBUS_9);

			goto err_irq;

		}

	}

	retval = sonic_open(dev);

	if (retval)

		goto err_irq_nubus;

	return 0;



err_irq_nubus:

	if (dev->irq == IRQ_AUTO_3)

	if (dev->irq == IRQ_AUTO_3)

		if (request_irq(IRQ_NUBUS_9, macsonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) {

		free_irq(IRQ_NUBUS_9, dev);

			printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, IRQ_NUBUS_9);

err_irq:

	free_irq(dev->irq, dev);

	free_irq(dev->irq, dev);

			return -EAGAIN;

err:

		}

	return retval;

	return sonic_open(dev);

}

}





static int macsonic_close(struct net_device* dev)

static int macsonic_close(struct net_device* dev)