From nobody Thu Mar 24 17:30:23 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 90A881A37173; Thu, 24 Mar 2022 17:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KPXL72lLbz3KNV; Thu, 24 Mar 2022 17:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648143023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UjxrQGK5Kn/09Zmxpkx1dAXjHUquAblxCQgvd1DYL2c=; b=v7fq6PgYrqz43WZN3ICkJA7TKHdcfGpqBHB0gh93RkysCagowIXe/NwmopwJdOQl1iuM6N CcxwfnfVRFPRU3QrSVuy40eRNjhyciz7WxA5FMP4e7jcb/x8HV33euNm3JHjOXe/dP/T1J eNAy0OAlCNnJXaaGc9omiubrDuuFLOjpLvLtQV79uF1sgvIGdDSjV93LpVIqpIkVDVRqgk DN261LbgN+mdBDoY6DRPEotdxz4pJnQ+mFqy+02PKLvdXMGl/9tctNrXoW3lMfMpVFK/75 jAKyuFU7+jdH4F/Wb8TNbSOSxTEVBHaxp311ItPr6LQX9w6zwhP/qxHncG7/fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3B2731BFC4; Thu, 24 Mar 2022 17:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22OHUNDe081782; Thu, 24 Mar 2022 17:30:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22OHUNcR081781; Thu, 24 Mar 2022 17:30:23 GMT (envelope-from git) Date: Thu, 24 Mar 2022 17:30:23 GMT Message-Id: <202203241730.22OHUNcR081781@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: bbf3b7bdf876 - releng/13.1 - rtsx: Call rtsx_init() on resume. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: bbf3b7bdf87669026ade4ad0fb6fefde331e68c9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648143023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UjxrQGK5Kn/09Zmxpkx1dAXjHUquAblxCQgvd1DYL2c=; b=NJ6oyypTFSYCyPzSx2LEZDhKuFv7TxKZ2IKb2a0sDAxoe0YWoV+PEipX65ItmbaHW6AyN4 2AcbSDgr1V6CFj1EHGCmVaxiLOVZWXgChOjAAF1fYMl9+eZIBzro9QAKzDQ6eWcQC4JL9c BxggyOirvnqWBRvYx24f5EUNpS8x5fJ9QhYiudYb1Fe248unlGPRWMppslmJ8rxHCx0G3L 0KVErq20BJBrpbpZWWi0j1wrNgfXqXQiZTsd0Sjelm19+Gi4eZ+O9TIyMhwqMXwsucEig4 V8tUjiV5TyUNu+X23GJkartDTDhdBIIB89kEiMG+SJMdAHL1cbA7B3BKHYWHbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648143023; a=rsa-sha256; cv=none; b=ckr2wJucbGwlQ4Uni8kBsJmGNCuxqibLn2tpodyA/KypGKDMUXTPbCIYVQso3ZCyA4Qw9u idEu6NCAgaOrURmRsKGfZqX6UkF3gsBEg1gfsNjqK9bqpAMBggHo2sS1Dq2UWI1N3BIDaH 5reSkIqd9NCLpY0dLCyzVE7YSbPgxklSdRomMlW3XJbpTIbe5FHUkYNjD5iF7zvTjohtTO dy0yxXxgshhxZU8qO2TELqGj+qSwTt5UPuKrmGboKDLAs+GTLSkT3BemD+ns2FZdIby4gp GpZd9qiDPbNquvBpI2k9o0Ke3jA7EAsghXisXaEZHvhvrrY7gtcwIPci4QGKgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=bbf3b7bdf87669026ade4ad0fb6fefde331e68c9 commit bbf3b7bdf87669026ade4ad0fb6fefde331e68c9 Author: hlh-restart AuthorDate: 2022-03-19 16:37:24 +0000 Commit: Alexander Motin CommitDate: 2022-03-24 17:29:59 +0000 rtsx: Call rtsx_init() on resume. Approved by: re (gjb) (cherry picked from commit 1b1bab0078a7bbeb575942c4706a2abcd71d6022) (cherry picked from commit 205fa5f0a5cba5f9dc2ce9ef6c18a867bcd20e71) --- sys/dev/rtsx/rtsx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/rtsx/rtsx.c b/sys/dev/rtsx/rtsx.c index dffdbd2ca094..466e6a864ca4 100644 --- a/sys/dev/rtsx/rtsx.c +++ b/sys/dev/rtsx/rtsx.c @@ -173,7 +173,7 @@ struct rtsx_softc { #define RTSX_RTL8411 0x5289 #define RTSX_RTL8411B 0x5287 -#define RTSX_VERSION "2.1d" +#define RTSX_VERSION "2.1e" static const struct rtsx_device { uint16_t vendor_id; @@ -3822,6 +3822,8 @@ rtsx_resume(device_t dev) { device_printf(dev, "Resume\n"); + rtsx_init(device_get_softc(dev)); + bus_generic_resume(dev); return (0);