From owner-svn-src-stable-11@freebsd.org Sat Apr 25 12:39:29 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6FBED2AFE20; Sat, 25 Apr 2020 12:39:29 +0000 (UTC) (envelope-from dim@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 498Vwd2Prpz40hx; Sat, 25 Apr 2020 12:39:29 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4DF0D7AC2; Sat, 25 Apr 2020 12:39:29 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03PCdTKX057054; Sat, 25 Apr 2020 12:39:29 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03PCdTFb057053; Sat, 25 Apr 2020 12:39:29 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202004251239.03PCdTFb057053@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 25 Apr 2020 12:39:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r360297 - in stable: 11/sys/dev/ips 12/sys/dev/ips X-SVN-Group: stable-11 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in stable: 11/sys/dev/ips 12/sys/dev/ips X-SVN-Commit-Revision: 360297 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2020 12:39:29 -0000 Author: dim Date: Sat Apr 25 12:39:28 2020 New Revision: 360297 URL: https://svnweb.freebsd.org/changeset/base/360297 Log: MFC r348366 (by lwhsu): Add the likely missing braces in ips(4). This is found by gcc warning that the code is not guarded by the if clause and has misleading indentation. Approved by: scottl Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D20427 Modified: stable/11/sys/dev/ips/ips.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/sys/dev/ips/ips.c Directory Properties: stable/12/ (props changed) Modified: stable/11/sys/dev/ips/ips.c ============================================================================== --- stable/11/sys/dev/ips/ips.c Sat Apr 25 11:35:38 2020 (r360296) +++ stable/11/sys/dev/ips/ips.c Sat Apr 25 12:39:28 2020 (r360297) @@ -281,10 +281,11 @@ static int ips_diskdev_free(ips_softc_t *sc) int i; int error = 0; for(i = 0; i < IPS_MAX_NUM_DRIVES; i++){ - if(sc->diskdev[i]) + if(sc->diskdev[i]) { error = device_delete_child(sc->dev, sc->diskdev[i]); if(error) return error; + } } bus_generic_detach(sc->dev); return 0;