From patchwork Tue Sep 17 01:47:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Veaceslav Falico X-Patchwork-Id: 275351 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 135CF2C00F3 for ; Tue, 17 Sep 2013 11:48:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752169Ab3IQBrk (ORCPT ); Mon, 16 Sep 2013 21:47:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50625 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752106Ab3IQBra (ORCPT ); Mon, 16 Sep 2013 21:47:30 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8H1lSbk031975 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 16 Sep 2013 21:47:28 -0400 Received: from darkmag.usersys.redhat.com (dhcp-27-102.brq.redhat.com [10.34.27.102]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r8H1lNUb032026; Mon, 16 Sep 2013 21:47:26 -0400 From: Veaceslav Falico To: linux-kernel@vger.kernel.org Cc: Veaceslav Falico , Bjorn Helgaas , linux-pci@vger.kernel.org Subject: [PATCH 2/3] msi: always unregister ->msi_kset within free_msi_irqs() Date: Tue, 17 Sep 2013 03:47:43 +0200 Message-Id: <1379382464-7920-3-git-send-email-vfalico@redhat.com> In-Reply-To: <1379382464-7920-1-git-send-email-vfalico@redhat.com> References: <1379382464-7920-1-git-send-email-vfalico@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Currently we create and populate ->msi_kset while allocating irqs in populate_msi_sysfs(), however if it fails and/or we want to free the entries - we don't always remove it, and we might have problems if we've failed to allocate irqs and try it again. To fix that, move the unregister part to free_msi_irqs() and remove already existing ones. CC: Bjorn Helgaas CC: linux-pci@vger.kernel.org CC: linux-kernel@vger.kernel.org Signed-off-by: Veaceslav Falico --- drivers/pci/msi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 14bf578..68da921 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -388,6 +388,9 @@ static void free_msi_irqs(struct pci_dev *dev) list_del(&entry->list); kfree(entry); } + + kset_unregister(dev->msi_kset); + dev->msi_kset = NULL; } static struct msi_desc *alloc_msi_entry(struct pci_dev *dev) @@ -917,8 +920,6 @@ void pci_disable_msi(struct pci_dev *dev) pci_msi_shutdown(dev); free_msi_irqs(dev); - kset_unregister(dev->msi_kset); - dev->msi_kset = NULL; } EXPORT_SYMBOL(pci_disable_msi); @@ -1015,8 +1016,6 @@ void pci_disable_msix(struct pci_dev *dev) pci_msix_shutdown(dev); free_msi_irqs(dev); - kset_unregister(dev->msi_kset); - dev->msi_kset = NULL; } EXPORT_SYMBOL(pci_disable_msix);