Date: Wed, 29 Sep 2010 11:52:44 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r213268 - head/sys/dev/ral Message-ID: <201009291152.o8TBqioi008131@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Wed Sep 29 11:52:44 2010 New Revision: 213268 URL: http://svn.freebsd.org/changeset/base/213268 Log: 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. Reported by: Anton Shterenlikht mexas of bristol ac uk MFC after: 1 week Modified: head/sys/dev/ral/rt2560.c Modified: head/sys/dev/ral/rt2560.c ============================================================================== --- head/sys/dev/ral/rt2560.c Wed Sep 29 09:40:20 2010 (r213267) +++ head/sys/dev/ral/rt2560.c Wed Sep 29 11:52:44 2010 (r213268) @@ -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?201009291152.o8TBqioi008131>