Commit 7faae964 authored Jun 04, 2015 by Jia-Ju Bai Committed by Jeff Kirsher Jul 23, 2015

e1000e: Cleanup qos request in error handling of e1000_open



The driver lacks pm_qos_remove_request in error handling (err_req_irq) of
e1000_open, and qos request inserted by pm_qos_add_request is not removed.
This patch add pm_qos_remove_request in error handling to fix it.

Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 9cba434f

drivers/net/ethernet/intel/e1000e/netdev.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -4588,6 +4588,7 @@ static int e1000_open(struct net_device *netdev)
		return 0;

		err_req_irq:
		pm_qos_remove_request(&adapter->pm_qos_req);
		e1000e_release_hw_control(adapter);
		e1000_power_down_phy(adapter);
		e1000e_free_rx_resources(adapter->rx_ring);