From owner-svn-src-head@freebsd.org  Mon Mar  9 04:09:38 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 4DA2C2569D0;
 Mon,  9 Mar 2020 04:09:38 +0000 (UTC)
 (envelope-from philip@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 48bPr12nyzz4cBP;
 Mon,  9 Mar 2020 04:09:37 +0000 (UTC)
 (envelope-from philip@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 0286850BB;
 Mon,  9 Mar 2020 04:09:37 +0000 (UTC)
 (envelope-from philip@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02949axB067642;
 Mon, 9 Mar 2020 04:09:36 GMT (envelope-from philip@FreeBSD.org)
Received: (from philip@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02949anx067641;
 Mon, 9 Mar 2020 04:09:36 GMT (envelope-from philip@FreeBSD.org)
Message-Id: <202003090409.02949anx067641@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: philip set sender to
 philip@FreeBSD.org using -f
From: Philip Paeps <philip@FreeBSD.org>
Date: Mon, 9 Mar 2020 04:09:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r358801 - head/sys/riscv/sifive
X-SVN-Group: head
X-SVN-Commit-Author: philip
X-SVN-Commit-Paths: head/sys/riscv/sifive
X-SVN-Commit-Revision: 358801
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Mar 2020 04:09:38 -0000

Author: philip
Date: Mon Mar  9 04:09:36 2020
New Revision: 358801
URL: https://svnweb.freebsd.org/changeset/base/358801

Log:
  fuspi: silence build warning, plug resource leak
  
  This silences an "unused label" warning as well as fixes the attach fail
  path that wasn't releasing resources.
  
  Submitted by:   Nicholas O'Brien <nickisobrien_gmail.com>
  Sponsored by:	Axiado
  Differential Revision: https://reviews.freebsd.org/D24004

Modified:
  head/sys/riscv/sifive/fu540_spi.c

Modified: head/sys/riscv/sifive/fu540_spi.c
==============================================================================
--- head/sys/riscv/sifive/fu540_spi.c	Mon Mar  9 03:34:16 2020	(r358800)
+++ head/sys/riscv/sifive/fu540_spi.c	Mon Mar  9 04:09:36 2020	(r358801)
@@ -348,10 +348,8 @@ fuspi_attach(device_t dev)
 
 	return (0);
 
-fail1:
-	bus_release_resources(dev, fuspi_spec, &sc->res);
-
 fail:
+	bus_release_resources(dev, fuspi_spec, &sc->res);
 	mtx_destroy(&sc->mtx);
 	return (error);
 }