aboutsummaryrefslogtreecommitdiffstats
path: root/security/keys
diff options
context:
space:
mode:
authorKonstantin Khlebnikov <khlebnikov@openvz.org>2013-03-05 09:42:59 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-14 11:32:05 -0700
commitce38f02134fc8d9a43cf459a35581e046898c22b (patch)
tree9c702220c8c161bbfa1ff4a7db1d023ef8ec712d /security/keys
parent50a885c6f03d574acc5d88728ce5a8f4bb3df9fe (diff)
downloadkernel_samsung_smdk4412-ce38f02134fc8d9a43cf459a35581e046898c22b.tar.gz
kernel_samsung_smdk4412-ce38f02134fc8d9a43cf459a35581e046898c22b.tar.bz2
kernel_samsung_smdk4412-ce38f02134fc8d9a43cf459a35581e046898c22b.zip
e1000e: fix pci-device enable-counter balance
commit 4e0855dff094b0d56d6b5b271e0ce7851cc1e063 upstream. 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> Cc: Bruce Allan <bruce.w.allan@intel.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Tested-by: Borislav Petkov <bp@suse.de> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security/keys')
0 files changed, 0 insertions, 0 deletions