| Message ID | 20130612194408.8680.66934.email-sent-by-dnelson@teal |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, 2013-06-12 at 15:44 -0400, Dean Nelson wrote: > In attempting to resolve a minor merge conflict, commit > e5f2ef7ab4690d2e8faa > (Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) > accidently > dropped a call to pci_clear_master() that was intended to remain in > place. > > Commit 4e0855dff094b0d56d6b (e1000e: fix pci-device enable-counter > balance) > replaced a call to pci_disable_device() by one to pci_clear_master(). > And then > commit 66148babe728f3e00e13 (e1000e: fix runtime power management > transitions) > deleted a number of lines starting two lines following that call. > > This patch restores the call to pci_clear_master() in > __e1000_shutdown(). > > v2: added summary lines (enclosed in parens) following commit IDs > > Signed-off-by: Dean Nelson <dnelson@redhat.com> > --- > Both stable 3.8.y and 3.9.y appear to have the call to > pci_clear_master() in > __e1000_shutdown() as desired. I'm not sure how they avoided the > conflict. > > drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++ > 1 file changed, 2 insertions(+) Thanks Dean, I will add this to my e1000e queue.
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 77f81cb..5475cf4 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -5995,6 +5995,8 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime) */ e1000e_release_hw_control(adapter); + pci_clear_master(pdev); + /* The pci-e switch on some quad port adapters will report a * correctable error when the MAC transitions from D0 to D3. To * prevent this we need to mask off the correctable errors on the
In attempting to resolve a minor merge conflict, commit e5f2ef7ab4690d2e8faa (Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) accidently dropped a call to pci_clear_master() that was intended to remain in place. Commit 4e0855dff094b0d56d6b (e1000e: fix pci-device enable-counter balance) replaced a call to pci_disable_device() by one to pci_clear_master(). And then commit 66148babe728f3e00e13 (e1000e: fix runtime power management transitions) deleted a number of lines starting two lines following that call. This patch restores the call to pci_clear_master() in __e1000_shutdown(). v2: added summary lines (enclosed in parens) following commit IDs Signed-off-by: Dean Nelson <dnelson@redhat.com> --- Both stable 3.8.y and 3.9.y appear to have the call to pci_clear_master() in __e1000_shutdown() as desired. I'm not sure how they avoided the conflict. drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++ 1 file changed, 2 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html