From patchwork Fri Apr 27 15:16:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 155513 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 64092B6FA5 for ; Sat, 28 Apr 2012 01:24:30 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760580Ab2D0PVn (ORCPT ); Fri, 27 Apr 2012 11:21:43 -0400 Received: from mail-pz0-f51.google.com ([209.85.210.51]:50093 "EHLO mail-pz0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760581Ab2D0PVk (ORCPT ); Fri, 27 Apr 2012 11:21:40 -0400 Received: by mail-pz0-f51.google.com with SMTP id z8so1149168dad.10 for ; Fri, 27 Apr 2012 08:21:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=FZLpjDuMLoUIKPuLx3I5UysERjN2YXYJQ23QooNKTXk=; b=XiAXgdzwfkj5rW1aH5iefJOjcL8vgwXQjukUTjJyojuuQB9BUR9Zo1NSEfX4G+xxhX qEowlLD6oR1J4FNc7822F1nUmVKW2pCHfOKrVo3oT2Em9O/2xUzItzogQYBUt0x+uv+Z Qt/OaL9alkC2ehqfQHLbebTL58eG2OLMpAzLDgkfRMa7TzHKZvk56+L1ETZdhFZ6hNgz 8NYK+ycbZp415rez64oR7UDU73aFydw2rqaLKeDLJZodM81xPRDv8mvt3M/5jtp+fVd3 mSyRK43eCfDL5ix/LreUzbFPbr+HP5h4h3wal7bOupaesFqHbMjMXBNteqnS3cPFvjS1 DIUw== Received: by 10.68.75.45 with SMTP id z13mr12475478pbv.100.1335540100421; Fri, 27 Apr 2012 08:21:40 -0700 (PDT) Received: from localhost.localdomain ([221.221.26.142]) by mx.google.com with ESMTPS id 2sm6743917pbw.57.2012.04.27.08.21.30 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Apr 2012 08:21:38 -0700 (PDT) From: Jiang Liu To: Yinghai Lu , Kenji Kaneshige , Bjorn Helgaas , Don Dutile , Greg KH Cc: Jiang Liu , Keping Chen , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Jiang Liu Subject: [PATCH v2 11/19] PCI: release IO resource in error handling path in cpcihp_generic_init() Date: Fri, 27 Apr 2012 23:16:52 +0800 Message-Id: <1335539820-11232-12-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1335539820-11232-1-git-send-email-jiang.liu@huawei.com> References: <1335539820-11232-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Jiang Liu Release IO resource in error handling path in function cpcihp_generic_init(). Signed-off-by: Jiang Liu --- drivers/pci/hotplug/cpcihp_generic.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c index 81af764..518f387 100644 --- a/drivers/pci/hotplug/cpcihp_generic.c +++ b/drivers/pci/hotplug/cpcihp_generic.c @@ -157,16 +157,19 @@ static int __init cpcihp_generic_init(void) bus = pci_find_bus(0, bridge_busnr); if (!bus) { err("Invalid bus number %d", bridge_busnr); - return -EINVAL; - } - dev = pci_get_slot(bus, PCI_DEVFN(bridge_slot, 0)); - if(!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) { - err("Invalid bridge device %s", bridge); + } else { + dev = pci_get_slot(bus, PCI_DEVFN(bridge_slot, 0)); + if (!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) { + err("Invalid bridge device %s", bridge); + bus = NULL; + } else + bus = dev->subordinate; pci_dev_put(dev); - return -EINVAL; } - bus = dev->subordinate; - pci_dev_put(dev); + if (!bus) { + status = -EINVAL; + goto init_find_bus_error; + } memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller)); generic_hpc_ops.query_enum = query_enum; @@ -175,7 +178,8 @@ static int __init cpcihp_generic_init(void) status = cpci_hp_register_controller(&generic_hpc); if(status != 0) { err("Could not register cPCI hotplug controller"); - return -ENODEV; + status = -ENODEV; + goto init_find_bus_error; } dbg("registered controller"); @@ -193,10 +197,13 @@ static int __init cpcihp_generic_init(void) } dbg("started cpci hp system"); return 0; + init_start_error: cpci_hp_unregister_bus(bus); init_bus_register_error: cpci_hp_unregister_controller(&generic_hpc); +init_find_bus_error: + release_region(port, 1); err("status = %d", status); return status;