Thread (4 messages) 4 messages, 2 authors, 2014-06-20

Re: [ANNOUNCE] 3.12.22-rt33

From: Steven Rostedt <rostedt@goodmis.org>
Date: 2014-06-19 13:44:22
Also in: lkml

On Thu, 19 Jun 2014 05:46:43 +0200
Mike Galbraith [off-list ref] wrote:
On Wed, 2014-06-18 at 20:12 -0400, Steven Rostedt wrote: 
quoted
Dear RT Folks,

I'm pleased to announce the 3.12.22-rt33 stable release.
Didn't we have this issue before?
quoted hunk ↗ jump to hunk

git@marge:~/linux-2.6> git diff v3.12... drivers/net/ethernet/dec/tulip/tulip_core.c
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index 4e8cfa2ac803..a6d4653ebbc3 100644
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -1939,7 +1939,9 @@ static void tulip_remove_one(struct pci_dev *pdev)
 	pci_iounmap(pdev, tp->base_addr);
 	free_netdev (dev);
 	pci_release_regions (pdev);
+	pci_disable_device(pdev);
 	pci_set_drvdata (pdev, NULL);
+	pci_disable_device(pdev);
 
 	/* pci_power_off (pdev, -1); */
 }
commit 4a77edc195f0b03644e84dda00fcfe9827868e8e
Author: Ingo Molnar [off-list ref]
Date:   Fri Jul 3 08:30:18 2009 -0500

    drivers/net: tulip_remove_one needs to call pci_disable_device()
    
    Otherwise the device is not completely shut down.
Grumble, this was a fix that went into -rt without going into stable
first.

OK, I'll remove this commit and keep the stable one.

Thanks!

-- Steve
quoted hunk ↗ jump to hunk
    
    Signed-off-by: Ingo Molnar [off-list ref]
    Signed-off-by: Thomas Gleixner [off-list ref]
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index 4e8cfa2ac803..7565b994ec50 100644
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -1939,6 +1939,7 @@ static void tulip_remove_one(struct pci_dev *pdev)
 	pci_iounmap(pdev, tp->base_addr);
 	free_netdev (dev);
 	pci_release_regions (pdev);
+	pci_disable_device(pdev);
 	pci_set_drvdata (pdev, NULL);
 
 	/* pci_power_off (pdev, -1); */

commit 831bb5573dcbeb0da783c82e21084ac191dafc24
Author: Ingo Molnar [off-list ref]
Date:   Fri Feb 14 15:32:20 2014 +0100

    drivers/net: tulip_remove_one needs to call pci_disable_device()
    
    commit c321f7d7c87cdc623c87845f6378620573e57512 upstream.
    
    Otherwise the device is not completely shut down.
    
    Signed-off-by: Ingo Molnar [off-list ref]
    Signed-off-by: Thomas Gleixner [off-list ref]
    Signed-off-by: Sebastian Andrzej Siewior [off-list ref]
    Signed-off-by: David S. Miller [off-list ref]
    Signed-off-by: Jiri Slaby [off-list ref]
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index 4e8cfa2ac803..779016068a82 100644
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -1940,6 +1940,7 @@ static void tulip_remove_one(struct pci_dev *pdev)
 	free_netdev (dev);
 	pci_release_regions (pdev);
 	pci_set_drvdata (pdev, NULL);
+	pci_disable_device(pdev);
 
 	/* pci_power_off (pdev, -1); */
 }
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help