[kernel/f20] Fix WARN from e100 from Michele Baldessari (rhbz 994438)

[Josh Boyer]

commit 20823449a9243a98d81b3ebfd7b714648b755633
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Fri Feb 21 08:16:59 2014 -0500

    Fix WARN from e100 from Michele Baldessari (rhbz 994438)

 ...disabling-already-disabled-device-warning.patch |   65 ++++++++++++++++++++
 kernel.spec                                        |    9 +++
 2 files changed, 74 insertions(+), 0 deletions(-)
---
diff --git a/e100-Fix-disabling-already-disabled-device-warning.patch b/e100-Fix-disabling-already-disabled-device-warning.patch
new file mode 100644
index 0000000..d989828
--- /dev/null
+++ b/e100-Fix-disabling-already-disabled-device-warning.patch
@@ -0,0 +1,65 @@
+Bugzilla: 994438
+Upstream-status: 3.14
+
+From 2b6e0ca175fe4a20f21ba82b1e7ccc71029c4dd4 Mon Sep 17 00:00:00 2001
+From: Michele Baldessari <michele at acksyn.org>
+Date: Thu, 30 Jan 2014 10:51:04 +0000
+Subject: [PATCH] e100: Fix "disabling already-disabled device" warning
+
+In https://bugzilla.redhat.com/show_bug.cgi?id=994438 and
+https://bugzilla.redhat.com/show_bug.cgi?id=970480  we
+received different reports of e100 throwing the following
+warning:
+
+ [<c06a0ba5>] ? pci_disable_device+0x85/0x90
+ [<c044a153>] warn_slowpath_fmt+0x33/0x40
+ [<c06a0ba5>] pci_disable_device+0x85/0x90
+ [<f7fdf7e0>] __e100_shutdown+0x80/0x120 [e100]
+ [<c0476ca5>] ? check_preempt_curr+0x65/0x90
+ [<f7fdf8d6>] e100_suspend+0x16/0x30 [e100]
+ [<c06a1ebb>] pci_legacy_suspend+0x2b/0xb0
+ [<c098fc0f>] ? wait_for_completion+0x1f/0xd0
+ [<c06a2d50>] ? pci_pm_poweroff+0xb0/0xb0
+ [<c06a2de4>] pci_pm_freeze+0x94/0xa0
+ [<c0767bb7>] dpm_run_callback+0x37/0x80
+ [<c076a204>] ? pm_wakeup_pending+0xc4/0x140
+ [<c0767f12>] __device_suspend+0xb2/0x1f0
+ [<c076806f>] async_suspend+0x1f/0x90
+ [<c04706e5>] async_run_entry_fn+0x35/0x140
+ [<c0478aef>] ? wake_up_process+0x1f/0x40
+ [<c0464495>] process_one_work+0x115/0x370
+ [<c0462645>] ? start_worker+0x25/0x30
+ [<c0464dc5>] ? manage_workers.isra.27+0x1a5/0x250
+ [<c0464f6e>] worker_thread+0xfe/0x330
+ [<c0464e70>] ? manage_workers.isra.27+0x250/0x250
+ [<c046a224>] kthread+0x94/0xa0
+ [<c0997f37>] ret_from_kernel_thread+0x1b/0x28
+ [<c046a190>] ? insert_kthread_work+0x30/0x30
+
+This patch removes pci_disable_device() from __e100_shutdown().
+pci_clear_master() is enough.
+
+Signed-off-by: Michele Baldessari <michele at acksyn.org>
+Tested-by: Mark Harig <idirectscm at aim.com>
+Signed-off-by: Aaron Brown <aaron.f.brown at intel.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/ethernet/intel/e100.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
+index cbaba44..bf7a01e 100644
+--- a/drivers/net/ethernet/intel/e100.c
++++ b/drivers/net/ethernet/intel/e100.c
+@@ -3034,7 +3034,7 @@ static void __e100_shutdown(struct pci_dev *pdev, bool *enable_wake)
+ 		*enable_wake = false;
+ 	}
+ 
+-	pci_disable_device(pdev);
++	pci_clear_master(pdev);
+ }
+ 
+ static int __e100_power_off(struct pci_dev *pdev, bool wake)
+-- 
+1.8.5.3
+
diff --git a/kernel.spec b/kernel.spec
index 7403b97..2746af8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -764,6 +764,9 @@ Patch25201: cifs-sanity-check-length-of-data-to-send-before-sending.patch
 #rhbz 1054408
 Patch25203: cpufreq-powernow-k8-Initialize-per-cpu-data-structures-properly.patch
 
+#rhbz 994438
+Patch25024: e100-Fix-disabling-already-disabled-device-warning.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1484,6 +1487,9 @@ ApplyPatch cifs-sanity-check-length-of-data-to-send-before-sending.patch
 #rhbz 1054408
 ApplyPatch cpufreq-powernow-k8-Initialize-per-cpu-data-structures-properly.patch
 
+#rhbz 994438
+ApplyPatch e100-Fix-disabling-already-disabled-device-warning.patch
+
 
 # END OF PATCH APPLICATIONS
 
@@ -2296,6 +2302,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Feb 21 2014 Josh Boyer <jwboyer at fedoraproject.org>
+- Fix WARN from e100 from Michele Baldessari (rhbz 994438)
+
 * Thu Feb 20 2014 Peter Robinson <pbrobinson at fedoraproject.org>
 - Rebase i.MX6 Utilite to upstream version