Date: Mon, 7 Jan 2019 04:34:15 +0000 (UTC) From: Andriy Voskoboinyk <avos@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r342832 - stable/12/sys/dev/rtwn/rtl8188e Message-ID: <201901070434.x074YFAY042887@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avos Date: Mon Jan 7 04:34:15 2019 New Revision: 342832 URL: https://svnweb.freebsd.org/changeset/base/342832 Log: MFC r342679: rtwn(4): do not try to start RTL8188E* MCU during device shutdown. Modified: stable/12/sys/dev/rtwn/rtl8188e/r88e_fw.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/rtwn/rtl8188e/r88e_fw.c ============================================================================== --- stable/12/sys/dev/rtwn/rtl8188e/r88e_fw.c Mon Jan 7 04:31:41 2019 (r342831) +++ stable/12/sys/dev/rtwn/rtl8188e/r88e_fw.c Mon Jan 7 04:34:15 2019 (r342832) @@ -109,7 +109,11 @@ r88e_fw_reset(struct rtwn_softc *sc, int reason) reg = rtwn_read_2(sc, R92C_SYS_FUNC_EN); rtwn_write_2(sc, R92C_SYS_FUNC_EN, reg & ~R92C_SYS_FUNC_EN_CPUEN); - rtwn_write_2(sc, R92C_SYS_FUNC_EN, reg | R92C_SYS_FUNC_EN_CPUEN); + + if (reason != RTWN_FW_RESET_SHUTDOWN) { + rtwn_write_2(sc, R92C_SYS_FUNC_EN, + reg | R92C_SYS_FUNC_EN_CPUEN); + } } void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901070434.x074YFAY042887>