From owner-svn-src-head@FreeBSD.ORG  Mon Mar 30 08:48:33 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C66E7106564A;
	Mon, 30 Mar 2009 08:48:33 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B50758FC18;
	Mon, 30 Mar 2009 08:48:33 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2U8mXUs058573;
	Mon, 30 Mar 2009 08:48:33 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2U8mXFc058572;
	Mon, 30 Mar 2009 08:48:33 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <200903300848.n2U8mXFc058572@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Mon, 30 Mar 2009 08:48:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190544 - head/sys/dev/malo
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Mar 2009 08:48:34 -0000

Author: weongyo
Date: Mon Mar 30 08:48:33 2009
New Revision: 190544
URL: http://svn.freebsd.org/changeset/base/190544

Log:
  handles more exceptional cases when the driver failed to attach.
  
  MFC after:	3 days

Modified:
  head/sys/dev/malo/if_malo_pci.c

Modified: head/sys/dev/malo/if_malo_pci.c
==============================================================================
--- head/sys/dev/malo/if_malo_pci.c	Mon Mar 30 08:47:28 2009	(r190543)
+++ head/sys/dev/malo/if_malo_pci.c	Mon Mar 30 08:48:33 2009	(r190544)
@@ -260,12 +260,13 @@ malo_pci_attach(device_t dev)
 
 	error = malo_attach(pci_get_device(dev), sc);
 
-	if (error != 0) {
-		malo_pci_detach(dev);
-		return (error);
-	}
+	if (error != 0)
+		goto bad2;
 
 	return (error);
+
+bad2:
+	bus_dma_tag_destroy(sc->malo_dmat);
 bad1:
 	if (psc->malo_msi == 0)
 		bus_teardown_intr(dev, psc->malo_res_irq[0],
@@ -275,10 +276,11 @@ bad1:
 			bus_teardown_intr(dev, psc->malo_res_irq[i],
 			    psc->malo_intrhand[i]);
 	}
-
+	bus_release_resources(dev, psc->malo_irq_spec, psc->malo_res_irq);
 bad:
 	if (psc->malo_msi != 0)
 		pci_release_msi(dev);
+	bus_release_resources(dev, psc->malo_mem_spec, psc->malo_res_mem);
 
 	return (error);
 }