svn commit: r204953 - stable/7/sys/dev/ae
Gavin Atkinson
gavin at FreeBSD.org
Wed Mar 10 13:54:13 UTC 2010
Author: gavin
Date: Wed Mar 10 13:54:13 2010
New Revision: 204953
URL: http://svn.freebsd.org/changeset/base/204953
Log:
Merge r202000 from head:
Don't panic on attach if we can't allocate ifp
Modified:
stable/7/sys/dev/ae/if_ae.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/ae/if_ae.c
==============================================================================
--- stable/7/sys/dev/ae/if_ae.c Wed Mar 10 13:42:37 2010 (r204952)
+++ stable/7/sys/dev/ae/if_ae.c Wed Mar 10 13:54:13 2010 (r204953)
@@ -367,6 +367,7 @@ ae_attach(device_t dev)
if (ifp == NULL) {
device_printf(dev, "could not allocate ifnet structure.\n");
error = ENXIO;
+ goto fail;
}
ifp->if_softc = sc;
More information about the svn-src-stable-7
mailing list