From patchwork Sun Jun 7 12:11:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 481727 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1CD511401CB for ; Sun, 7 Jun 2015 22:12:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753204AbbFGML7 (ORCPT ); Sun, 7 Jun 2015 08:11:59 -0400 Received: from hauke-m.de ([5.39.93.123]:37318 "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752766AbbFGML5 (ORCPT ); Sun, 7 Jun 2015 08:11:57 -0400 Received: from hauke-desktop.fritz.box (p5DE9478E.dip0.t-ipconnect.de [93.233.71.142]) by hauke-m.de (Postfix) with ESMTPSA id 5D2B12016B; Sun, 7 Jun 2015 14:11:56 +0200 (CEST) From: Hauke Mehrtens To: zambrano@broadcom.com, davem@davemloft.net Cc: netdev@vger.kernel.org, Hauke Mehrtens Subject: [PATCH v2] b44: call netif_napi_del() Date: Sun, 7 Jun 2015 14:11:48 +0200 Message-Id: <1433679108-20923-1-git-send-email-hauke@hauke-m.de> X-Mailer: git-send-email 2.1.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When the driver gets unregistered a call to netif_napi_del() was missing, this all was also missing in the error paths of b44_init_one(). Signed-off-by: Hauke Mehrtens --- changes since v1: * netif_napi_del() is now also called in b44_init_one() error paths. drivers/net/ethernet/broadcom/b44.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c index 77363d6..a3b1c07 100644 --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c @@ -2464,6 +2464,7 @@ err_out_powerdown: ssb_bus_may_powerdown(sdev->bus); err_out_free_dev: + netif_napi_del(&bp->napi); free_netdev(dev); out: @@ -2480,6 +2481,7 @@ static void b44_remove_one(struct ssb_device *sdev) b44_unregister_phy_one(bp); ssb_device_disable(sdev, 0); ssb_bus_may_powerdown(sdev->bus); + netif_napi_del(&bp->napi); free_netdev(dev); ssb_pcihost_set_power_state(sdev, PCI_D3hot); ssb_set_drvdata(sdev, NULL);