svn commit: r187389 - in stable/7/sys: . arm/at91 contrib/pf
dev/ath/ath_hal dev/cxgb
Stanislav Sedov
stas at FreeBSD.org
Sun Jan 18 04:12:39 PST 2009
Author: stas
Date: Sun Jan 18 12:12:38 2009
New Revision: 187389
URL: http://svn.freebsd.org/changeset/base/187389
Log:
- Merge r184309:
Add a missing NULL-pointer check.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/arm/at91/at91.c
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
Modified: stable/7/sys/arm/at91/at91.c
==============================================================================
--- stable/7/sys/arm/at91/at91.c Sun Jan 18 12:09:24 2009 (r187388)
+++ stable/7/sys/arm/at91/at91.c Sun Jan 18 12:12:38 2009 (r187389)
@@ -577,8 +577,10 @@ at91_alloc_resource(device_t dev, device
#endif
rle->res = rman_reserve_resource(&sc->sc_mem_rman,
start, end, count, flags, child);
- rman_set_bustag(rle->res, &at91_bs_tag);
- rman_set_bushandle(rle->res, start);
+ if (rle->res != NULL) {
+ rman_set_bustag(rle->res, &at91_bs_tag);
+ rman_set_bushandle(rle->res, start);
+ }
break;
}
if (rle->res) {
More information about the svn-src-stable-7
mailing list