From owner-p4-projects  Sun Dec 22 11:28: 5 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 094DB37B405; Sun, 22 Dec 2002 11:28:04 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AE74537B401
	for <perforce@freebsd.org>; Sun, 22 Dec 2002 11:28:03 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6760C43ED8
	for <perforce@freebsd.org>; Sun, 22 Dec 2002 11:28:03 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMJS3fh013234
	for <perforce@freebsd.org>; Sun, 22 Dec 2002 11:28:03 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMJS2Vb013231
	for perforce@freebsd.org; Sun, 22 Dec 2002 11:28:02 -0800 (PST)
Date: Sun, 22 Dec 2002 11:28:02 -0800 (PST)
Message-Id: <200212221928.gBMJS2Vb013231@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Subject: PERFORCE change 22627 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=22627

Change 22627 by marcel@marcel_nfs on 2002/12/22 11:27:53

	Improve upon the previous commit.

Affected files ...

.. //depot/projects/ia64/sys/dev/sio/sio_ebus.c#5 edit

Differences ...

==== //depot/projects/ia64/sys/dev/sio/sio_ebus.c#5 (text+ko) ====

@@ -110,7 +110,9 @@
 	com = device_get_softc(dev);
 	rid = 0;
 	res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8,
-	    RF_ACTIVE);
+	    RF_ACTIVE);	
+	if (res == NULL)
+		return (ENXIO);
 	com->bsh = rman_get_bushandle(res);
 	com->bst = rman_get_bustag(res);
 	error = sioprobe(dev);
@@ -130,9 +132,9 @@
 	rid = 0;
 	res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8,
 	    RF_ACTIVE);
-	com->bsh = rman_get_bushandle(res);
-	com->bst = rman_get_bustag(res);
-	error = sioattach(dev, 0, 0UL);
+	if (res == NULL)
+		return (ENXIO);
+	error = sioattach(dev);
 	if (error)
 		bus_release_resource(dev, SYS_RES_IOPORT, rid, res);
 	return (error);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message