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

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

[Mike Ditto]

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

Signed-off-by: Mike Ditto <mditto@consentry.com>
---
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
@@ -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;

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

[Kumar Gala]

On Oct 24, 2008, at 8:03 PM, Mike Ditto wrote:

> If something goes wrong attaching to phy driver, we weren't freeing  
> the IRQ.
>
> Signed-off-by: Mike Ditto <mditto@consentry.com>
> ---
> 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
> @@ -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

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

[Mike Ditto]

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

Signed-off-by: Mike Ditto <mditto@consentry.com>
---
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
@@ -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;

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

[Kumar Gala]

On Oct 27, 2008, at 4:46 PM, Mike Ditto wrote:

> If something goes wrong attaching to phy driver, we weren't freeing
> the IRQ.
>
> Signed-off-by: Mike Ditto <mditto@consentry.com>
> ---
> 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
> @@ -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;
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev

Dave,

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

- k

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

[David Miller]

From: Kumar Gala <galak@kernel.crashing.org>
Date: Tue, 13 Jan 2009 10:28:15 -0600

> 
> On Oct 27, 2008, at 4:46 PM, Mike Ditto wrote:
> 
> > If something goes wrong attaching to phy driver, we weren't freeing
> > the IRQ.
> >
> > Signed-off-by: Mike Ditto <mditto@consentry.com>
 ...
> This seems to have gotten lost in the shuffle.  Can you please apply.

The netdev patchwork never saw it for some reason.

Applied, thanks.