2020-02-04 11:38:44

by Thomas Bogendoerfer

Subject: [PATCH net] net: sgi: ioc3-eth: Remove leftover free_irq()

Commit 0ce5ebd24d25 ("mfd: ioc3: Add driver for SGI IOC3 chip") moved
request_irq() from ioc3_open into probe function, but forgot to remove
free_irq() from ioc3_close.

Fixes: 0ce5ebd24d25 ("mfd: ioc3: Add driver for SGI IOC3 chip")
Signed-off-by: Thomas Bogendoerfer <[email protected]>
---
drivers/net/ethernet/sgi/ioc3-eth.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index e61eb891c0f7..db6b2988e632 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -823,7 +823,6 @@ static int ioc3_close(struct net_device *dev)
netif_stop_queue(dev);

ioc3_stop(ip);
- free_irq(dev->irq, dev);

ioc3_free_rx_bufs(ip);
ioc3_clean_tx_ring(ip);
--
2.24.1

2020-02-04 11:46:03

by David Miller

Subject: Re: [PATCH net] net: sgi: ioc3-eth: Remove leftover free_irq()

From: Thomas Bogendoerfer <[email protected]>
Date: Tue, 4 Feb 2020 12:36:28 +0100

> Commit 0ce5ebd24d25 ("mfd: ioc3: Add driver for SGI IOC3 chip") moved
> request_irq() from ioc3_open into probe function, but forgot to remove
> free_irq() from ioc3_close.
>
> Fixes: 0ce5ebd24d25 ("mfd: ioc3: Add driver for SGI IOC3 chip")
> Signed-off-by: Thomas Bogendoerfer <[email protected]>

ioc3_open() still has the request_irq() in my tree.

2020-02-04 12:00:45

by Thomas Bogendoerfer

Subject: Re: [PATCH net] net: sgi: ioc3-eth: Remove leftover free_irq()

On Tue, 04 Feb 2020 12:44:55 +0100 (CET)
David Miller <[email protected]> wrote:

> From: Thomas Bogendoerfer <[email protected]>
> Date: Tue, 4 Feb 2020 12:36:28 +0100
>
> > Commit 0ce5ebd24d25 ("mfd: ioc3: Add driver for SGI IOC3 chip") moved
> > request_irq() from ioc3_open into probe function, but forgot to remove
> > free_irq() from ioc3_close.
> >
> > Fixes: 0ce5ebd24d25 ("mfd: ioc3: Add driver for SGI IOC3 chip")
> > Signed-off-by: Thomas Bogendoerfer <[email protected]>
>
> ioc3_open() still has the request_irq() in my tree.

then I guess you don't have commit 0ce5ebd24d25 in your tree. My Patch is
against linus/master, where it is already applied. Should I rebase against your
net tree, when the commit shows up ?

Thomas.

--
SUSE Software Solutions Germany GmbH
HRB 36809 (AG N?rnberg)
Gesch?ftsf?hrer: Felix Imend?rffer

2020-02-04 13:44:08

by David Miller

Subject: Re: [PATCH net] net: sgi: ioc3-eth: Remove leftover free_irq()

From: Thomas Bogendoerfer <[email protected]>
Date: Tue, 4 Feb 2020 12:58:33 +0100

> On Tue, 04 Feb 2020 12:44:55 +0100 (CET)
> David Miller <[email protected]> wrote:
>
>> From: Thomas Bogendoerfer <[email protected]>
>> Date: Tue, 4 Feb 2020 12:36:28 +0100
>>
>> > Commit 0ce5ebd24d25 ("mfd: ioc3: Add driver for SGI IOC3 chip") moved
>> > request_irq() from ioc3_open into probe function, but forgot to remove
>> > free_irq() from ioc3_close.
>> >
>> > Fixes: 0ce5ebd24d25 ("mfd: ioc3: Add driver for SGI IOC3 chip")
>> > Signed-off-by: Thomas Bogendoerfer <[email protected]>
>>
>> ioc3_open() still has the request_irq() in my tree.
>
> then I guess you don't have commit 0ce5ebd24d25 in your tree. My Patch is
> against linus/master, where it is already applied. Should I rebase against your
> net tree, when the commit shows up ?

I just sync'd with Linus's tree so you should be able to rebase right now.

Thanks.