From owner-cvs-src@FreeBSD.ORG  Tue Feb 28 09:32:10 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0DA6C16A420;
	Tue, 28 Feb 2006 09:32:10 +0000 (GMT)
	(envelope-from iedowse@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 98A3C43D4C;
	Tue, 28 Feb 2006 09:32:09 +0000 (GMT)
	(envelope-from iedowse@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 k1S9W9YT012618;
	Tue, 28 Feb 2006 09:32:09 GMT
	(envelope-from iedowse@repoman.freebsd.org)
Received: (from iedowse@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1S9W9dH012617;
	Tue, 28 Feb 2006 09:32:09 GMT (envelope-from iedowse)
Message-Id: <200602280932.k1S9W9dH012617@repoman.freebsd.org>
From: Ian Dowse <iedowse@FreeBSD.org>
Date: Tue, 28 Feb 2006 09:32:08 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_4
Cc: 
Subject: cvs commit: src/sys/dev/usb usb.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Feb 2006 09:32:10 -0000

iedowse     2006-02-28 09:32:08 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_4)
    sys/dev/usb          usb.c 
  Log:
  Fix an old mis-merge in 1.26.2.11 that invoked usb_cold_explore()
  too late in the boot process - "cold" is guaranteed to be false at
  SI_SUB_INT_CONFIG_HOOKS, but it was being KASSERTed as true. With
  usb_cold_explore() now running at the correct time, it does need
  to use polling mode and splusb(), so back out 1.26.2.14.
  
  PR:             usb/81524
  Tested by:      Eugene Grosbein
  
  Revision   Changes    Path
  1.26.2.15  +6 -3      src/sys/dev/usb/usb.c