Date: Wed, 10 Mar 2010 13:54:13 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r204953 - stable/7/sys/dev/ae Message-ID: <201003101354.o2ADsDdT055566@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003101354.o2ADsDdT055566>