From owner-p4-projects@FreeBSD.ORG  Mon Feb 13 21:17:37 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 20C9316A439; Mon, 13 Feb 2006 21:17:36 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 C184316A422
	for <perforce@freebsd.org>; Mon, 13 Feb 2006 21:17:35 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 70F8643D58
	for <perforce@freebsd.org>; Mon, 13 Feb 2006 21:17:35 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DLHZ0d025814
	for <perforce@freebsd.org>; Mon, 13 Feb 2006 21:17:35 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DLHZtK025811
	for perforce@freebsd.org; Mon, 13 Feb 2006 21:17:35 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 13 Feb 2006 21:17:35 GMT
Message-Id: <200602132117.k1DLHZtK025811@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 91696 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Feb 2006 21:17:37 -0000

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

Change 91696 by imp@imp_Speedy on 2006/02/13 21:17:16

	debug

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#4 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#4 (text+ko) ====

@@ -64,13 +64,13 @@
 
 	/* XXX where does it say so in the spec? */
 	sc->sc_bus.usbrev = USBREV_1_0;
-	strlcpy(sc->sc_vendor, "Atmel", sizeof(sc->sc_vendor));
 
 	rid = MEM_RID;
 	sc->io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
 	    RF_ACTIVE);
 	if (sc->io_res == NULL) {
-		err = ENXIO;
+	    printf("1\n");
+		err = ENOMEM;
 		goto error;
 	}
 	sc->iot = rman_get_bustag(sc->io_res);
@@ -80,11 +80,13 @@
 	sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_ACTIVE);
 	if (sc->irq_res == NULL) {
-		err = ENXIO;
+	    printf("2\n");
+		err = ENOMEM;
 		goto error;
 	}
 	sc->sc_bus.bdev = device_add_child(dev, "usb", -1);
 	if (sc->sc_bus.bdev == NULL) {
+	    printf("3\n");
 		err = ENOMEM;
 		goto error;
 	}
@@ -93,9 +95,11 @@
 	err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_BIO, ohci_intr, sc,
 	    &sc->ih);
 	if (err) {
+	    printf("4\n");
 		err = ENXIO;
 		goto error;
 	}
+	strlcpy(sc->sc_vendor, "Atmel", sizeof(sc->sc_vendor));
 	err = ohci_init(sc);
 	if (!err) {
 		sc->sc_flags |= OHCI_SCFLG_DONEINIT;