From nobody Sun Sep 14 17:47:32 2025 X-Original-To: dev-commits-src-main@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 4cPwbn0JJpz67Clb; Sun, 14 Sep 2025 17:47:33 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cPwbm52btz3cpJ; Sun, 14 Sep 2025 17:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757872052; 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=M/pXWatFqmA+VyJZ0D58FHxrLF6eFFrCY/UtZEyDNyI=; b=gXFfHEPOKEWtVwkMM7ClkoCMzE/+rB7e9zftfM7MLTV1YShy5g7gBpOkV8abozB/ep+exy hTEhHldVUfT1U+mBcNk5v6Us+KUGxc0GntHfEUFUo7GiItyDn40lB7JUwSuBzYdjLWvVgA fayh+p/FNGuL5VeTRHUELLL6yJJN+YwyOQHmcT/r5GFT3AJZQg3a9iYUWFwToyCTq+Butn 5j555SNbqUj96vr08qKvoLeszpNnzqoaQnzQfk7PTN3jblvZR3A3+ybrSqcB1EhR2NfGj7 zHo3/FHhwCUeTXpIxVFRl0hW9E6opmaGhQuR3RB98wGP/i7S8mcvQWS/Rh4hQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757872052; 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=M/pXWatFqmA+VyJZ0D58FHxrLF6eFFrCY/UtZEyDNyI=; b=QIOD4eEx4aTYEfj92/9uJIlGS1q+tX5P4Wq09JtcMi2tJ4OFCT4o8Le6cCCZadtCDmSDtj 8Md6Q6llH4jTfYROFnnlSP3WeZUOAi5rPMc4mnuIk0z16HmfS7bOp+LSzoQ+VrjPvFN5r7 NIRo3bIpgTqWavNTVgGE8e2H1yM7mJ7g+znSH+m+ybzi/gXtMgrqpZJiMa0/F52nqD78Wh JpYuR5D5SH9SGPJKEl9XXbrhbcAJAlhAJV5KAwGH5SwMS2qMkKHSFbNpYgKBmf6cTNmVnx n1Omwx1Ue/6Zed2rxo56nPumhx6806SFn2WcGjv97b8sTtVOtrES/FKQMmOSIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757872052; a=rsa-sha256; cv=none; b=oY12IgF62ddEw6BVFDYp3wmGTxGzmI7Y8pZoHhwo0rkJjz6zzrv64R9f40K2AH+9R0P+2C pPtrG/E45vPh08iZIyt5fyCf93QMYm6RkJRnI397kR8ufV6GHET3VuStcBnRcivXrxwudZ YULenOiQQpUUcnqB91dFP4tpqqTDGtwjeAToSBsB5aPaDebQ4E3DoHQVEyf0VtVqv6xuIS UnBMjLGgtmiVEgqQ1fhiHcQGZNnkRjVpqKCsBjrk78EssvFdFGytCDTtajzq3j3r9gt6oZ 6xAokRIu1WNdVYyCkeGmxKAmSqTQXZtahjhlmSzvurdLAQf+hZCzR83luoQDtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cPwbm4bQmz3ss; Sun, 14 Sep 2025 17:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58EHlWlp084698; Sun, 14 Sep 2025 17:47:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58EHlWn5084695; Sun, 14 Sep 2025 17:47:32 GMT (envelope-from git) Date: Sun, 14 Sep 2025 17:47:32 GMT Message-Id: <202509141747.58EHlWn5084695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a85adbcd3dee - main - mpr3mr: Fix missing braces List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a85adbcd3dee8d062bf49e1f713e718f59ec0e9f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a85adbcd3dee8d062bf49e1f713e718f59ec0e9f commit a85adbcd3dee8d062bf49e1f713e718f59ec0e9f Author: Warner Losh AuthorDate: 2025-09-14 17:18:44 +0000 Commit: Warner Losh CommitDate: 2025-09-14 17:18:44 +0000 mpr3mr: Fix missing braces We detect an error condiction and print it. And then unconditionally jump to the err code, which is incorrect. It's clear from indentation and code tracing there should be braces here. Sponsored by: Netflix --- sys/dev/mpi3mr/mpi3mr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c index 99edd3542619..4211529e76ad 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -2799,10 +2799,11 @@ retry_init: U32 fault = mpi3mr_regread(sc, MPI3_SYSIF_FAULT_OFFSET) & MPI3_SYSIF_FAULT_CODE_MASK; - if (fault == MPI3_SYSIF_FAULT_CODE_INSUFFICIENT_PCI_SLOT_POWER) + if (fault == MPI3_SYSIF_FAULT_CODE_INSUFFICIENT_PCI_SLOT_POWER) { mpi3mr_dprint(sc, MPI3MR_INFO, "controller faulted due to insufficient power, try by connecting it in a different slot\n"); goto err; + } U32 host_diagnostic; timeout = MPI3_SYSIF_DIAG_SAVE_TIMEOUT * 10;