From owner-svn-src-head@freebsd.org  Mon Mar 26 14:03:40 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5527DF6FCC2;
 Mon, 26 Mar 2018 14:03:40 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 05BAF7F88A;
 Mon, 26 Mar 2018 14:03:40 +0000 (UTC)
 (envelope-from kevans@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 005B65E5F;
 Mon, 26 Mar 2018 14:03:40 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2QE3dLP021286;
 Mon, 26 Mar 2018 14:03:39 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2QE3dA9021285;
 Mon, 26 Mar 2018 14:03:39 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201803261403.w2QE3dA9021285@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Mon, 26 Mar 2018 14:03:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r331548 - head/sys/arm/allwinner
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/sys/arm/allwinner
X-SVN-Commit-Revision: 331548
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.25
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, 26 Mar 2018 14:03:40 -0000

Author: kevans
Date: Mon Mar 26 14:03:39 2018
New Revision: 331548
URL: https://svnweb.freebsd.org/changeset/base/331548

Log:
  aw_sid(4): Release resources and destroy mutex on failure
  
  Submitted by:	Eugene Sevastyanov <eval@iptk.ru>

Modified:
  head/sys/arm/allwinner/aw_sid.c

Modified: head/sys/arm/allwinner/aw_sid.c
==============================================================================
--- head/sys/arm/allwinner/aw_sid.c	Mon Mar 26 13:45:17 2018	(r331547)
+++ head/sys/arm/allwinner/aw_sid.c	Mon Mar 26 14:03:39 2018	(r331548)
@@ -207,7 +207,7 @@ aw_sid_attach(device_t dev)
 		for (i = 0; i < sc->sid_conf->efuse_size; i += 4)
 			if (aw_sid_prctl_read(dev, i, &val) != 0) {
 				device_printf(dev, "failed prctl read\n");
-				return (ENXIO);
+				goto fail;
 			}
 
 	SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
@@ -217,6 +217,11 @@ aw_sid_attach(device_t dev)
 	    dev, AW_SID_ROOT_KEY, aw_sid_sysctl, "A", "Root Key");
 
 	return (0);
+
+fail:
+	bus_release_resources(dev, aw_sid_spec, &sc->res);
+	mtx_destroy(&sc->prctl_mtx);
+	return (ENXIO);
 }
 
 int