From nobody Sat Mar 16 15:16:36 2024 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 4Txl850wHxz5F1HW; Sat, 16 Mar 2024 15:16:37 +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 4Txl845B3Fz4H8K; Sat, 16 Mar 2024 15:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710602196; 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=IybmJIhCuD1cUAV7s9WZnaH8nLHErZMa84RHG0nZmMQ=; b=TRsE6oe9YEOFFR/uGFxgh+rbdEjD7mASy1HQ3wcq0u3RoBmCyx4x4RJJyFOWuwpuAISf0U a/620Y8Yw3T25SWWui82nOCisgs5taX9vxmnMsHaP8uYg18ao2TODzy+7JEesbL33iuqru AhN1Q7mfPKm6znLW6S0d8BdonijAT99Ew0kNgcQ1N764pjGX0O4bIDU28ZGAyUxdekTUQM 5Ho40NkvW/rOIR5UYcyNr3aiPJlmpeKQ3IbsrbIKwCNNYuZ90LpyCfCAsnTamLXW4ROAtP xrafSMBS7Ua+iZvMB3JqDDJ0kbad/h6lj+d5EZY6ZQU202QXeUDHZjpBnT3kVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710602196; a=rsa-sha256; cv=none; b=ldVncprmIjAw/qOfJFe6pV84glE51WPi1a5dYbE4TRPD6MsgjYjbhpTNrdmJKS06rz6fps yt2eqivv0f6OMjjGrCSBoqQqFclC+KlPoJjo+QF2e8UmZerGB0xWIagh0+l7ucglRBquUo vN5Jh2opdAZ+gDMqduME4r2HwN9INIDG1FdWy2cw0SZbO3lQW6OdIO5U8mMoqMVVcK7b+U Ibi0TGafphiwreHAJm9KeRB0Qvv/fyE8X+SJDY8lHpbP075uHdky0cjlb3HfHovu4Ar6w0 5+sCjHI//8c3lx9ajgxQDbgsHMp5yXi1m/XcYTKRs7+kgU7DDoK3ApYlLuH0EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710602196; 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=IybmJIhCuD1cUAV7s9WZnaH8nLHErZMa84RHG0nZmMQ=; b=YipD+WoAT6hRiLYMeG59evPFMpdTAtZRciFJK8838VtI8tOdcIMc3YmyZ+zJoggZYLDm3L U7zJjwQSZcsvbunwyB63xFqyv5VdgkntplJrQ0SetcrdCknC9geS53tujL08eu/i7WPOab RmKT+FQFgw3RM88D6tyWtmw5ntgZdUnZg07jLKtvPLu1SjRrjwj6KUW8RLbj1afKJIWHyh zEq4PLdOgKOyd5tPa3OcpqrF9iscF0nP63tQHkIQR5F7pmviHaoXocxzb8U9AWuMtNYEtM 4ocTZWOlwvOwBeEMzb7iskGOFEFwSmtMBR3Rxw0ub0M+kNltOZkpvPk68du/Bg== 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 4Txl844S3Lz10p7; Sat, 16 Mar 2024 15:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42GFGaSJ062974; Sat, 16 Mar 2024 15:16:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42GFGa06062971; Sat, 16 Mar 2024 15:16:36 GMT (envelope-from git) Date: Sat, 16 Mar 2024 15:16:36 GMT Message-Id: <202403161516.42GFGa06062971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 5578ace4a174 - stable/13 - ugen: fix USB_IFACE_DRIVER_ACTIVE after detaching a driver 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5578ace4a174e6f6e4bce39f22472959cd4e745c Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=5578ace4a174e6f6e4bce39f22472959cd4e745c commit 5578ace4a174e6f6e4bce39f22472959cd4e745c Author: Andriy Gapon AuthorDate: 2024-02-19 10:44:00 +0000 Commit: Andriy Gapon CommitDate: 2024-03-16 15:09:30 +0000 ugen: fix USB_IFACE_DRIVER_ACTIVE after detaching a driver Previosuly, USB_IFACE_DRIVER_ACTIVE would report that the driver is active even after it detached. That's because a device(9) still remains. So, add device_is_alive(9) check for more accurate reporting. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43960 (cherry picked from commit 8f374fa528d7643919bca1b4153dde03996305fe) --- sys/dev/usb/usb_generic.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/usb/usb_generic.c b/sys/dev/usb/usb_generic.c index 1086e3daa0a6..6e5a00d37d4b 100644 --- a/sys/dev/usb/usb_generic.c +++ b/sys/dev/usb/usb_generic.c @@ -2377,12 +2377,10 @@ ugen_ioctl_post(struct usb_fifo *f, u_long cmd, void *addr, int fflags) break; case USB_IFACE_DRIVER_ACTIVE: - n = *u.pint & 0xFF; - iface = usbd_get_iface(f->udev, n); - - if (iface && iface->subdev) + if (iface != NULL && iface->subdev != NULL && + device_is_alive(iface->subdev)) error = 0; else error = ENXIO;