From owner-svn-src-all@FreeBSD.ORG Thu Jan 15 15:46:46 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C4CB10656DB; Thu, 15 Jan 2009 15:46:45 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id ADF048FC1B; Thu, 15 Jan 2009 15:46:45 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (pool-98-109-39-197.nwrknj.fios.verizon.net [98.109.39.197]) by cyrus.watson.org (Postfix) with ESMTPSA id 5BDA146B59; Thu, 15 Jan 2009 10:46:45 -0500 (EST) Received: from localhost (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.14.3/8.14.3) with ESMTP id n0FFk573001666; Thu, 15 Jan 2009 10:46:39 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Nathan Whitehorn Date: Thu, 15 Jan 2009 10:29:26 -0500 User-Agent: KMail/1.9.7 References: <200901061723.n06HNbgY037287@svn.freebsd.org> In-Reply-To: <200901061723.n06HNbgY037287@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901151029.27357.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Thu, 15 Jan 2009 10:46:39 -0500 (EST) X-Virus-Scanned: ClamAV version 0.94.2, clamav-milter version 0.94.2 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-3.5 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r186833 - head/sys/dev/iicbus X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jan 2009 15:46:48 -0000 On Tuesday 06 January 2009 12:23:37 pm Nathan Whitehorn wrote: > Modified: head/sys/dev/iicbus/iic.c > =========================================================================== >=== --- head/sys/dev/iicbus/iic.c Tue Jan 6 17:05:44 2009 (r186832) > +++ head/sys/dev/iicbus/iic.c Tue Jan 6 17:23:37 2009 (r186833) > @@ -110,14 +110,14 @@ iic_identify(driver_t *driver, device_t > { > > if (device_find_child(parent, "iic", -1) == NULL) > - BUS_ADD_CHILD(parent, 0, "iic", -1); > + BUS_ADD_CHILD(parent, 0, "iic", 0); > } This change is wrong, it always tries to add iic0 instead of letting new-bus pick the unit number. Basically, if you have a system with iicbus0 and iicbus1, this will try to add a second iic0 child to iicbus1 instead of iic1. Please revert. > Modified: head/sys/dev/iicbus/iicbus.c > =========================================================================== >=== --- head/sys/dev/iicbus/iicbus.c Tue Jan 6 17:05:44 2009 (r186832) +++ > head/sys/dev/iicbus/iicbus.c Tue Jan 6 17:23:37 2009 (r186833) @@ -53,7 > +53,9 @@ iicbus_probe(device_t dev) > { > > device_set_desc(dev, "Philips I2C bus"); > - return (0); > + > + /* Allow other subclasses to override this driver. */ > + return (-1000); I think BUS_PROBE_GENERIC is what you want here. pci(4) probably needs to be updated to use BUS_PROBE_GENERIC as well (which is what you copied this from I'm guessing). -- John Baldwin