Date: Tue, 12 Oct 2010 16:23:50 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r213728 - stable/8/sys/dev/ral Message-ID: <201010121623.o9CGNooX053328@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Tue Oct 12 16:23:50 2010 New Revision: 213728 URL: http://svn.freebsd.org/changeset/base/213728 Log: MFC 213268: If rt2560_bbp_init() fails, don't drop the lock as the callers of rt2560_init_locked() expect the lock to be held on return. Modified: stable/8/sys/dev/ral/rt2560.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/dev/ral/rt2560.c ============================================================================== --- stable/8/sys/dev/ral/rt2560.c Tue Oct 12 16:09:08 2010 (r213727) +++ stable/8/sys/dev/ral/rt2560.c Tue Oct 12 16:23:50 2010 (r213728) @@ -2667,8 +2667,7 @@ rt2560_init_locked(struct rt2560_softc * RAL_WRITE(sc, RT2560_CSR1, RT2560_HOST_READY); if (rt2560_bbp_init(sc) != 0) { - rt2560_stop(sc); - RAL_UNLOCK(sc); + rt2560_stop_locked(sc); return; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010121623.o9CGNooX053328>