From patchwork Thu Jun 4 13:07:27 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: 480682 X-Patchwork-Delegate: jeffrey.t.kirsher@intel.com 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 035841401B5 for ; Thu, 4 Jun 2015 23:07:45 +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=ZBCM9fRr; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3BBAB95C0C; Thu, 4 Jun 2015 13:07:45 +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 eTHA+y3BtEpz; Thu, 4 Jun 2015 13:07:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id CE1099594B; Thu, 4 Jun 2015 13:07:44 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 98FD31BF959 for ; Thu, 4 Jun 2015 13:07:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8E5CD32C91 for ; Thu, 4 Jun 2015 13:07:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3VoeJHsihTKt for ; Thu, 4 Jun 2015 13:07:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from m12-18.163.com (m12-18.163.com [220.181.12.18]) by silver.osuosl.org (Postfix) with ESMTP id 73ECD32C33 for ; Thu, 4 Jun 2015 13:07:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=Lodut1F+GCyZoBV7X/ 2fPa40IoqfsJjF+VLrEFynQDE=; b=ZBCM9fRrGKGafYU1xlzO2WHxk0vbvwRW3X 6ROqUEC42yKT/1F259/K+dIHv49IwzPmJffc2ckIHYaL89qv8J1GZqw/YGV6v4SZ z8Yk3V7AalCF2SMFTgg/f0jm6W4JBJIkNrOii1XCzc82VnaTya+L/UwQxbUm1R2g W7MUYyQgM= Received: from bai-oslab.tsinghua.edu.cn (unknown [166.111.70.50]) by smtp14 (Coremail) with SMTP id EsCowED5GWCTTXBVfQNLBg--.10589S2; Thu, 04 Jun 2015 21:07:39 +0800 (CST) From: Jia-Ju Bai To: intel-wired-lan@lists.osuosl.org Date: Thu, 4 Jun 2015 21:07:27 +0800 Message-Id: <1433423247-27228-1-git-send-email-baijiaju1990@163.com> X-Mailer: git-send-email 1.7.9.5 X-CM-TRANSID: EsCowED5GWCTTXBVfQNLBg--.10589S2 X-Coremail-Antispam: 1Uf129KBjvdXoWruFyfuF43Aw4UAFy7KF4fAFb_yoWfZFXEkr 4Fvw1xtrW5JF1FyF47ArWfA34akFnrXFyFyFnaqa4fuw17Ar48Wryv9FnrXFs7G345uFZr J34aqFW3A3yY9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRRT5l5UUUUU== X-Originating-IP: [166.111.70.50] X-CM-SenderInfo: xedlyx5dmximizq6il2tof0z/1tbiYw4PelD+cpbE8wAAsl Cc: Jia-Ju Bai 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: , MIME-Version: 1.0 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 Tested-by: Aaron Brown --- 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);