Date: Thu, 27 Dec 2012 19:06:45 +0000 (GMT) From: Gavin Atkinson <gavin@FreeBSD.org> To: Aleksandr Rybalko <ray@FreeBSD.org> Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r244668 - projects/efika_mx/sys/dev/fdt Message-ID: <alpine.BSF.2.00.1212271903220.27184@thunderhorn.york.ac.uk> In-Reply-To: <201212242228.qBOMSrcd093127@svn.freebsd.org> References: <201212242228.qBOMSrcd093127@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 24 Dec 2012, Aleksandr Rybalko wrote: > Author: ray > Date: Mon Dec 24 22:28:52 2012 > New Revision: 244668 > URL: http://svnweb.freebsd.org/changeset/base/244668 > > Log: > Resources can be optional, so report lack of resource only if verbose. > > Sponsored by: FreeBSD Foundation > > Modified: > projects/efika_mx/sys/dev/fdt/simplebus.c > > Modified: projects/efika_mx/sys/dev/fdt/simplebus.c > ============================================================================== > --- projects/efika_mx/sys/dev/fdt/simplebus.c Mon Dec 24 22:26:03 2012 (r244667) > +++ projects/efika_mx/sys/dev/fdt/simplebus.c Mon Dec 24 22:28:52 2012 (r244668) > @@ -259,7 +259,7 @@ simplebus_alloc_resource(device_t bus, d > type = SYS_RES_MEMORY; > > rle = resource_list_find(&di->di_res, type, *rid); > - if (rle == NULL) { > + if (rle == NULL && bootverbose) { > device_printf(bus, "no default resources for " > "rid = %d, type = %d\n", *rid, type); > return (NULL); This appears to be wrong to me - before the code would return(NULL) if rle == NULL, whereas now both rle == NULL && bootverbose must be true to return. Later on, the code relies on rle being non-null, so will now presumably panic if !bootverbose. Gavin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.1212271903220.27184>