From patchwork Thu Jun 4 08:56:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia-Ju Bai X-Patchwork-Id: 480566 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 9F7421401AF for ; Thu, 4 Jun 2015 19:11:44 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b=Q+N7RtgN; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 71E9A94CF0; Thu, 4 Jun 2015 09:11:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VCzHNO59d8GW; Thu, 4 Jun 2015 09:11:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id F035F94C9C; Thu, 4 Jun 2015 09:11:42 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 954A91C1FB4 for ; Thu, 4 Jun 2015 09:11:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8EB8F8FA04 for ; Thu, 4 Jun 2015 09:11:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YP3xdg5Ve19I for ; Thu, 4 Jun 2015 09:11:40 +0000 (UTC) X-Greylist: delayed 00:15:06 by SQLgrey-1.7.6 Received: from m13-93.163.com (m13-93.163.com [220.181.13.93]) by whitealder.osuosl.org (Postfix) with ESMTP id 7F9B78F6C5 for ; Thu, 4 Jun 2015 09:11:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:MIME-Version:Message-ID; bh=isNXU Rzb9cAQfxkzxlwttovqdHxrzK++D0pBhtu6iGw=; b=Q+N7RtgNc1t7wP4+/KwHp osvQn7EDqd8uFeulGKQJ+cSU0MqELhSn7457JeVDPdhhGFYhziIr3XvfbKiVcCxX rbp5PBrlwZ42TL6lStQYPp7/mSUtpBWsIlqYJh9jLWuHvQkUjFRcDdz62yN2RBuV dtIFBHYrsTKGRlxTRfqAcI= Received: from baijiaju1990$163.com ( [166.111.70.4] ) by ajax-webmail-wmsvr93 (Coremail) ; Thu, 4 Jun 2015 16:56:30 +0800 (CST) X-Originating-IP: [166.111.70.4] Date: Thu, 4 Jun 2015 16:56:30 +0800 (CST) From: "Jia-Ju Bai" To: intel-wired-lan@lists.osuosl.org X-Priority: 3 X-Mailer: Coremail Webmail Server Version SP_ntes V3.5 build 20150119(59087.7062) Copyright (c) 2002-2015 www.mailtech.cn 163com MIME-Version: 1.0 Message-ID: <55011bb8.127b.14dbdc937a1.Coremail.baijiaju1990@163.com> X-CM-TRANSID: XcGowEAJ1EK+EnBV8xswAA--.734W X-CM-SenderInfo: xedlyx5dmximizq6il2tof0z/xtbBRR4PelO-vLANOgAAs5 X-Coremail-Antispam: 1U5529EdanIXcx71UUUUU7vcSsGvfC2KfnxnUU== Subject: [Intel-wired-lan] [PATCH] e1000e: Cleanup qos request in error handling of e1000_open X-BeenThere: intel-wired-lan@lists.osuosl.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@lists.osuosl.org Sender: "Intel-wired-lan" 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 --- drivers/net/ethernet/intel/e1000e/netdev.c | 1 + 1 file changed, 1 insertion(+) 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);