* [PATCH 2/3] macsonic: free irq if sonic_open() fails
@ 2010-07-10 11:01 Kulikov Vasiliy
2010-07-10 11:22 ` Dan Carpenter
0 siblings, 1 reply; 5+ messages in thread
From: Kulikov Vasiliy @ 2010-07-10 11:01 UTC (permalink / raw)
To: kernel-janitors
Cc: David S. Miller, Finn Thain, Uwe Kleine-König, Tejun Heo,
Geert Uytterhoeven, netdev
macsonic_open() doesn't check sonic_open() return code. If it is error
we must free requested IRQ.
Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
---
drivers/net/macsonic.c | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index adb54fe..3730762 100644
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -140,21 +140,39 @@ static irqreturn_t macsonic_interrupt(int irq, void *dev_id)
static int macsonic_open(struct net_device* dev)
{
- if (request_irq(dev->irq, sonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) {
- printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);
- return -EAGAIN;
+ int retval;
+
+ 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
* 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.
*/
- if (dev->irq == IRQ_AUTO_3)
- if (request_irq(IRQ_NUBUS_9, macsonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) {
- printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, IRQ_NUBUS_9);
- free_irq(dev->irq, dev);
- return -EAGAIN;
+ 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;
}
- return sonic_open(dev);
+ }
+ retval = sonic_open(dev);
+ if (retval)
+ goto err_irq_nubus;
+ return 0;
+
+err_irq_nubus:
+ free_irq(IRQ_NUBUS_9, dev);
+err_irq:
+ free_irq(dev->irq, dev);
+err:
+ return retval;
}
static int macsonic_close(struct net_device* dev)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/3] macsonic: free irq if sonic_open() fails
2010-07-10 11:01 [PATCH 2/3] macsonic: free irq if sonic_open() fails Kulikov Vasiliy
@ 2010-07-10 11:22 ` Dan Carpenter
2010-07-10 11:30 ` Kulikov Vasiliy
0 siblings, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2010-07-10 11:22 UTC (permalink / raw)
To: Kulikov Vasiliy
Cc: kernel-janitors, David S. Miller, Finn Thain,
Uwe Kleine-König, Tejun Heo, Geert Uytterhoeven, netdev
On Sat, Jul 10, 2010 at 03:01:00PM +0400, Kulikov Vasiliy wrote:
> + 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;
> }
> - return sonic_open(dev);
> + }
> + retval = sonic_open(dev);
> + if (retval)
> + goto err_irq_nubus;
> + return 0;
> +
> +err_irq_nubus:
This should be:
+ if (dev->irq == IRQ_AUTO_3)
+ free_irq(IRQ_NUBUS_9, dev);
> +err_irq:
> + free_irq(dev->irq, dev);
> +err:
> + return retval;
> }
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 2/3] macsonic: free irq if sonic_open() fails
2010-07-10 11:22 ` Dan Carpenter
@ 2010-07-10 11:30 ` Kulikov Vasiliy
2010-07-10 11:39 ` [PATCH 2/3 v2] macsonic: free irqs " Kulikov Vasiliy
0 siblings, 1 reply; 5+ messages in thread
From: Kulikov Vasiliy @ 2010-07-10 11:30 UTC (permalink / raw)
To: Dan Carpenter
Cc: kernel-janitors, David S. Miller, Finn Thain,
Uwe Kleine-König, Tejun Heo, Geert Uytterhoeven, netdev
On Sat, Jul 10, 2010 at 13:22 +0200, Dan Carpenter wrote:
> On Sat, Jul 10, 2010 at 03:01:00PM +0400, Kulikov Vasiliy wrote:
>
> > + 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;
> > }
> > - return sonic_open(dev);
> > + }
> > + retval = sonic_open(dev);
> > + if (retval)
> > + goto err_irq_nubus;
> > + return 0;
> > +
> > +err_irq_nubus:
>
> This should be:
>
> + if (dev->irq == IRQ_AUTO_3)
> + free_irq(IRQ_NUBUS_9, dev);
Of course, thank you.
>
> > +err_irq:
> > + free_irq(dev->irq, dev);
> > +err:
> > + return retval;
> > }
>
> regards,
> dan carpenter
>
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/3 v2] macsonic: free irqs if sonic_open() fails
2010-07-10 11:30 ` Kulikov Vasiliy
@ 2010-07-10 11:39 ` Kulikov Vasiliy
2010-07-13 3:33 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Kulikov Vasiliy @ 2010-07-10 11:39 UTC (permalink / raw)
To: Dan Carpenter
Cc: kernel-janitors, David S. Miller, Finn Thain,
Uwe Kleine-König, Tejun Heo, Geert Uytterhoeven, netdev
macsonic_open() doesn't check sonic_open() return code. If it is error
we must free requested IRQs.
Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: Dan Carpenter <error27@gmail.com>
---
drivers/net/macsonic.c | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index adb54fe..c93679e 100644
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -140,21 +140,40 @@ static irqreturn_t macsonic_interrupt(int irq, void *dev_id)
static int macsonic_open(struct net_device* dev)
{
- if (request_irq(dev->irq, sonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) {
- printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);
- return -EAGAIN;
+ int retval;
+
+ 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
* 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.
*/
- if (dev->irq == IRQ_AUTO_3)
- if (request_irq(IRQ_NUBUS_9, macsonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) {
- printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, IRQ_NUBUS_9);
- free_irq(dev->irq, dev);
- return -EAGAIN;
+ 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;
}
- return sonic_open(dev);
+ }
+ retval = sonic_open(dev);
+ if (retval)
+ goto err_irq_nubus;
+ return 0;
+
+err_irq_nubus:
+ if (dev->irq == IRQ_AUTO_3)
+ free_irq(IRQ_NUBUS_9, dev);
+err_irq:
+ free_irq(dev->irq, dev);
+err:
+ return retval;
}
static int macsonic_close(struct net_device* dev)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-07-13 3:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-10 11:01 [PATCH 2/3] macsonic: free irq if sonic_open() fails Kulikov Vasiliy
2010-07-10 11:22 ` Dan Carpenter
2010-07-10 11:30 ` Kulikov Vasiliy
2010-07-10 11:39 ` [PATCH 2/3 v2] macsonic: free irqs " Kulikov Vasiliy
2010-07-13 3:33 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).