From: Konstantin Khlebnikov <khlebnikov@openvz.org>
To: linux-kernel@vger.kernel.org
Cc: e1000-devel@lists.sourceforge.net,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Bruce Allan <bruce.w.allan@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [PATCH RESEND 1/3] e1000e: fix pci-device enable-counter balance
Date: Mon, 25 Feb 2013 09:19:04 +0400 [thread overview]
Message-ID: <20130225051903.12689.77185.stgit@zurg> (raw)
In-Reply-To: <20130225051010.12689.28611.stgit@zurg>
This patch removes redundant and unbalanced pci_disable_device() from
__e1000_shutdown(). pci_clear_master() is enough, device can go into
suspended state with elevated enable_cnt.
Bug was introduced in commit 23606cf5d1192c2b17912cb2ef6e62f9b11de133
("e1000e / PCI / PM: Add basic runtime PM support (rev. 4)") in v2.6.35
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: e1000-devel@lists.sourceforge.net
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Bruce Allan <bruce.w.allan@intel.com>
---
drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index a177b8b..1799021 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5986,7 +5986,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,
*/
e1000e_release_hw_control(adapter);
- pci_disable_device(pdev);
+ pci_clear_master(pdev);
return 0;
}
next prev parent reply other threads:[~2013-02-25 5:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-25 5:18 [PATCH RESEND 0/3] e1000e: return runtime-pm back to work Konstantin Khlebnikov
2013-02-25 5:19 ` Konstantin Khlebnikov [this message]
2013-03-05 1:33 ` [PATCH RESEND 1/3] e1000e: fix pci-device enable-counter balance Jeff Kirsher
2013-02-25 5:19 ` [PATCH RESEND 2/3] e1000e: fix runtime power management transitions Konstantin Khlebnikov
2013-03-05 1:34 ` Jeff Kirsher
2013-02-25 5:19 ` [PATCH RESEND 3/3] e1000e: fix accessing to suspended device Konstantin Khlebnikov
2013-02-26 1:09 ` [E1000-devel] " Waskiewicz Jr, Peter P
2013-02-26 10:03 ` Konstantin Khlebnikov
2013-02-26 23:35 ` Ben Hutchings
2013-03-02 12:26 ` Konstantin Khlebnikov
2013-03-05 1:35 ` Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130225051903.12689.77185.stgit@zurg \
--to=khlebnikov@openvz.org \
--cc=bruce.w.allan@intel.com \
--cc=e1000-devel@lists.sourceforge.net \
--cc=jeffrey.t.kirsher@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome