Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Dec 2002 11:28:02 -0800 (PST)
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 22627 for review
Message-ID:  <200212221928.gBMJS2Vb013231@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212221928.gBMJS2Vb013231>