| Message ID | 1433423247-27228-1-git-send-email-baijiaju1990@163.com |
|---|---|
| State | Accepted |
| Delegated to: | Jeff Kirsher |
| Headers | show |
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces@lists.osuosl.org] On > Behalf Of Jia-Ju Bai > Sent: Thursday, June 04, 2015 6:07 AM > To: intel-wired-lan@lists.osuosl.org > Cc: Jia-Ju Bai > Subject: [Intel-wired-lan] [PATCH] 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> > --- > drivers/net/ethernet/intel/e1000e/netdev.c | 1 + > 1 file changed, 1 insertion(+) Tested-by: Aaron Brown <aaron.f.brown@intel.com>
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index c509a5c..f8c0dc4 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -4451,6 +4451,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);
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> --- drivers/net/ethernet/intel/e1000e/netdev.c | 1 + 1 file changed, 1 insertion(+)