Skip to contentSkip to conversation

powerpc: Add missing irq free in fs_enet error path.

PATCH Applied Mike Ditto 3 participants 5 messages Oct 25, 2008 – Jan 15, 2009

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Mike Ditto

author
#0 lore raw

PATCH v2 1/1 powerpc: Add missing irq free in fs_enet error path.

If something goes wrong attaching to phy driver, we weren't freeing the IRQ.

Signed-off-by Mike Ditto <[email protected]>

---
I just noticed this file has already been touched in -rc1 so here is the patch again, adjusted accordingly.

drivers/net/fs_enet/fs_enet-main.c 2008-10-24 17:57:03.000000000 -0700 renamed from drivers/net/fs_enet/fs_enet-main.c 2008-10-24 17:54:31.000000000 -0700 +1 -0
diff -r -upN 2.6.28-rc1/drivers/net/fs_enet/fs_enet-main.c NEW/drivers/net/fs_enet/fs_enet-main.c
@@ -795,6 +795,7 @@ static int fs_enet_open(struct net_devic
 
        err = fs_init_phy(dev);
        if (err) {
+               free_irq(fep->interrupt, dev);
                if (fep->fpi->use_napi)
                        napi_disable(&fep->napi);
                return err;
#1 lore raw
Quoted 13 lines · Mike Ditto

If something goes wrong attaching to phy driver, we weren't freeing the IRQ.

Signed-off-by Mike Ditto <[email protected]>

---
I just noticed this file has already been touched in -rc1 so here is the patch again, adjusted accordingly.

diff -r -upN 2.6.28-rc1/drivers/net/fs_enet/fs_enet-main.c NEW/drivers/net/fs_enet/fs_enet-main.c
--- 2.6.28-rc1/drivers/net/fs_enet/fs_enet-main.c 2008-10-24
17:54:31.000000000 -0700
+++ NEW/drivers/net/fs_enet/fs_enet-main.c 2008-10-24
17:57:03.000000000 -0700

drivers/net/fs_enet/fs_enet-main.c 2008-10-24 17:57:03.000000000 -0700 static int fs_enet_open(struct net_devic · line 801

Quoted 7 lines
drivers/net/fs_enet/fs_enet-main.c 2008-10-24 17:57:03.000000000 -0700 renamed from drivers/net/fs_enet/fs_enet-main.c 2008-10-24 17:54:31.000000000 -0700 +1 -0
@@ -795,6 +795,7 @@ static int fs_enet_open(struct net_devic
 
       err = fs_init_phy(dev);
       if (err) {
+               free_irq(fep->interrupt, dev);
               if (fep->fpi->use_napi)
                       napi_disable(&fep->napi);
               return err;

Please copy Jeff Garizk and the netdev list as such patches normally go though that path.

- k

author
#2 lore raw

Re: [PATCH v2] powerpc/fs_enet: Add missing irq free in error path.

If something goes wrong attaching to phy driver, we weren't freeing the IRQ.

Signed-off-by Mike Ditto <[email protected]>

---
Reposting to CC netdev list. (Thanks, Kumar)

drivers/net/fs_enet/fs_enet-main.c +1 -0
diff -r -upN 2.6.28-rc1/drivers/net/fs_enet/fs_enet-main.c NEW/drivers/net/fs_enet/fs_enet-main.c
@@ -795,6 +795,7 @@ static int fs_enet_open(struct net_devic
 
 	err = fs_init_phy(dev);
 	if (err) {
+		free_irq(fep->interrupt, dev);
 		if (fep->fpi->use_napi)
 			napi_disable(&fep->napi);
 		return err;
#3 lore raw

Re: [PATCH v2] powerpc/fs_enet: Add missing irq free in error path.

Quoted 20 lines · Mike Ditto

If something goes wrong attaching to phy driver, we weren't freeing the IRQ.

Signed-off-by Mike Ditto <[email protected]>

---
Reposting to CC netdev list. (Thanks, Kumar)

diff -r -upN 2.6.28-rc1/drivers/net/fs_enet/fs_enet-main.c NEW/drivers/net/fs_enet/fs_enet-main.c
--- 2.6.28-rc1/drivers/net/fs_enet/fs_enet-main.c 2008-10-24
17:54:31.000000000 -0700
+++ NEW/drivers/net/fs_enet/fs_enet-main.c 2008-10-24
17:57:03.000000000 -0700

drivers/net/fs_enet/fs_enet-main.c +1 -0
@@ -795,6 +795,7 @@ static int fs_enet_open(struct net_devic
 
 	err = fs_init_phy(dev);
 	if (err) {
+		free_irq(fep->interrupt, dev);
 		if (fep->fpi->use_napi)
 			napi_disable(&fep->napi);
 		return err;
Quoted 4 lines

_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev

Dave,

This seems to have gotten lost in the shuffle. Can you please apply.

- k

maintainer Applied
#4 lore raw

Re: [PATCH v2] powerpc/fs_enet: Add missing irq free in error path.

From: Kumar Gala <[email protected]>
Date: Tue, 13 Jan 2009 10:28:15 -0600

Quoted 7 lines · Mike Ditto
Quoted 5 lines

If something goes wrong attaching to phy driver, we weren't freeing the IRQ.

Signed-off-by Mike Ditto <[email protected]>

...

Quoted 1 line

This seems to have gotten lost in the shuffle. Can you please apply.

The netdev patchwork never saw it for some reason.

Applied, thanks.