From nobody Tue Mar 22 00:29:09 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 5E93E1A0F000; Tue, 22 Mar 2022 00:29:09 +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 4KMsmj2Dcpz4ThH; Tue, 22 Mar 2022 00:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647908949; 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=HEkLduZq2eO+bCJUigkp4lB0JfkUTbH7GRHtXfgTEHs=; b=o+kFSTQNBGACniEbFK9X0MxwafyGE1U1eOZh+Oc/FBFuflHiaapxsRLuceBG8ngrd3sOYn 0ZLPXfN8fHT+VaODKpJx6/VVXfttHAXeUvXbhhMAJiu4Sbcdd1xQ//XmCCtIZtvqAKafKi LoFdloQVFVTdF8Zf1ltlXHpzIQ1Xrk0l80FRXEyejLU9koCQByqIcRkyYXT6mSNG3Hh5IC Ylz0N2NVOnG65nNv6ZaFJpzKDzVivL82Tvr9vqovCdxKfLOfWGJySG030aqjb+yYRqvFvI 08FtcNMVRL4tYiZ7fClxWrAJsL6puFB0VOg6GqCvfHDqThbchXJrY2s/3QR6wQ== 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 2C581250C7; Tue, 22 Mar 2022 00:29:09 +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 22M0T9AH006446; Tue, 22 Mar 2022 00:29:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22M0T9qn006445; Tue, 22 Mar 2022 00:29:09 GMT (envelope-from git) Date: Tue, 22 Mar 2022 00:29:09 GMT Message-Id: <202203220029.22M0T9qn006445@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: 205fa5f0a5cb - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 205fa5f0a5cba5f9dc2ce9ef6c18a867bcd20e71 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647908949; 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=HEkLduZq2eO+bCJUigkp4lB0JfkUTbH7GRHtXfgTEHs=; b=BZfejkSpWQxnSyFaXO2bVqpPXRdB3hnS/RReeYJ5Dff8HfhkcM8ES7dbpX37OzGk9/lm+8 Q5aPiQ/Vml744hJngyD7mcJbD8dx49GQVN9tUPP3q3nEUn5sy1EugYh3fL4MFCzd/zno5o zLmHeToUtGdCUmVywuY/CQJuAi3W6644ZiJUJa/epj8lYz2mx4Zmua/OYzRUejsvOv12xG wn2eNxNq31fMsHqE2iRZAP1+wfBMcv+NTKiIwoRKACgaru9QNQirti7JOt5Rp5YcL0u8gs 7hSn3Dk8GO7OUaJzYSfeGwVJtk9E+dRGwoY/LWRIa+MchKrjzUMBOB8n+9ysqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647908949; a=rsa-sha256; cv=none; b=WqwfOxl6FGCMA2OasI+YsO1jXBTVXGkeL6OyB4lWUJ652pTB6figYpxzqTI3REygfHGj0a 6Y26sSfw17dril+OHzK+Av+v9AVSs5K0l6ZlW8Mu1MEDFpfxeSrbpYUvkKIIRvzDQrWAIg rkOfIDfzIlmelu4ITyfCtXVVu81wP38bvsBM/thbdEBP3TcuKRh/6MnJwCs/9qBNgo+fjx WQvTD/r1ThN9QFM2Xy55re2Fv8+IznVTfk+FJo7PzWvUkrgz6C5VuDUtwEZP/H4+R3Pw78 MgabRQcESVY13NvhvorQU2DcYvD5kxdWjGID4eSvkhE5hWUQl+EQMveD8QcJUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=205fa5f0a5cba5f9dc2ce9ef6c18a867bcd20e71 commit 205fa5f0a5cba5f9dc2ce9ef6c18a867bcd20e71 Author: hlh-restart AuthorDate: 2022-03-19 16:37:24 +0000 Commit: Alexander Motin CommitDate: 2022-03-22 00:28:34 +0000 rtsx: Call rtsx_init() on resume. MFC after: 3 days (cherry picked from commit 1b1bab0078a7bbeb575942c4706a2abcd71d6022) --- 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);