From patchwork Sat Mar 20 10:21:16 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Yinghai Lu <yinghai@kernel.org>
X-Patchwork-Id: 87088
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2KAMfJb018461
	for <patchwork-pci@patchwork.kernel.org>;
	Sat, 20 Mar 2010 10:22:41 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751668Ab0CTKWX (ORCPT
	<rfc822;patchwork-pci@patchwork.kernel.org>);
	Sat, 20 Mar 2010 06:22:23 -0400
Received: from hera.kernel.org ([140.211.167.34]:35196 "EHLO hera.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751600Ab0CTKWW (ORCPT <rfc822;linux-pci@vger.kernel.org>);
	Sat, 20 Mar 2010 06:22:22 -0400
Received: from [129.150.227.205] (sca-ea-fw-1.Sun.COM [192.18.43.225])
	(authenticated bits=0)
	by hera.kernel.org (8.14.3/8.14.3) with ESMTP id o2KAMD8N006470
	(version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256
	verify=NO); Sat, 20 Mar 2010 10:22:19 GMT
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.95.2 at hera.kernel.org
Message-ID: <4BA4A19C.1010607@kernel.org>
Date: Sat, 20 Mar 2010 03:21:16 -0700
From: Yinghai Lu <yinghai@kernel.org>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.9.1.8) Gecko/20100228 SUSE/3.0.3-1.1.1 Thunderbird/3.0.3
MIME-Version: 1.0
To: "Brandeburg, Jesse" <jesse.brandeburg@intel.com>,
	Jesse Barnes <jbarnes@virtuousgeek.org>,
	David Woodhouse <David.Woodhouse@intel.com>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>
Subject: [PATCH] intel-iommu: don't call domain_exit if can not attach with
	iommu
References: <4BA42A95.4000301@kernel.org>
In-Reply-To: <4BA42A95.4000301@kernel.org>
Sender: linux-pci-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-pci.vger.kernel.org>
X-Mailing-List: linux-pci@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Sat, 20 Mar 2010 10:22:42 +0000 (UTC)


Index: linux-2.6/drivers/pci/intel-iommu.c
===================================================================
--- linux-2.6.orig/drivers/pci/intel-iommu.c
+++ linux-2.6/drivers/pci/intel-iommu.c
@@ -1853,7 +1857,7 @@ static struct dmar_domain *get_domain_fo
 
 	ret = iommu_attach_domain(domain, iommu);
 	if (ret) {
-		domain_exit(domain);
+		free_domain_mem(domain);
 		goto error;
 	}