From: Jia-Ju Bai <baijiaju1990@163.com>
Date: Thu, 4 Jun 2015 13:07:27 +0000 (+0800)
Subject: e1000e: Cleanup qos request in error handling of e1000_open
X-Git-Tag: v4.1.12-92~267^2^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=18d75152fb5d1f03c3db272a3b6af05367a88963;p=users%2Fjedix%2Flinux-maple.git

e1000e: Cleanup qos request in error handling of e1000_open

Orabug: 21792108

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>
(cherry picked from commit 7faae96421870ed990b0a84797c6b2377e81d079)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 89d788d8f263e..fea1601f32a36 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -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);