From owner-svn-src-all@freebsd.org  Wed Nov 23 01:44:30 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34309C4FAE6;
 Wed, 23 Nov 2016 01:44:30 +0000 (UTC)
 (envelope-from manu@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 mx1.freebsd.org (Postfix) with ESMTPS id EF7CF68D;
 Wed, 23 Nov 2016 01:44:29 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAN1iT75061650;
 Wed, 23 Nov 2016 01:44:29 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAN1iTVY061649;
 Wed, 23 Nov 2016 01:44:29 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <201611230144.uAN1iTVY061649@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: manu set sender to
 manu@FreeBSD.org using -f
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Wed, 23 Nov 2016 01:44:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r309029 - head/sys/arm/allwinner
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Nov 2016 01:44:30 -0000

Author: manu
Date: Wed Nov 23 01:44:28 2016
New Revision: 309029
URL: https://svnweb.freebsd.org/changeset/base/309029

Log:
  Do not attempt to disable/release clock if it had not been enabled.
  While here fix a style(9) issue.
  
  MFC after:	1 week

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

Modified: head/sys/arm/allwinner/a10_ehci.c
==============================================================================
--- head/sys/arm/allwinner/a10_ehci.c	Wed Nov 23 00:26:31 2016	(r309028)
+++ head/sys/arm/allwinner/a10_ehci.c	Wed Nov 23 01:44:28 2016	(r309029)
@@ -263,8 +263,10 @@ a10_ehci_attach(device_t self)
 	return (0);
 
 error:
-	if (aw_sc->clk)
+	if (aw_sc->clk != NULL) {
+		clk_disable(aw_sc->clk);
 		clk_release(aw_sc->clk);
+	}
 	a10_ehci_detach(self);
 	return (ENXIO);
 }
@@ -325,8 +327,10 @@ a10_ehci_detach(device_t self)
 	A10_WRITE_4(sc, SW_USB_PMU_IRQ_ENABLE, reg_value);
 
 	/* Disable clock for USB */
-	clk_disable(aw_sc->clk);
-	clk_release(aw_sc->clk);
+	if (aw_sc->clk != NULL) {
+		clk_disable(aw_sc->clk);
+		clk_release(aw_sc->clk);
+	}
 
 	/* Assert reset */
 	if (aw_sc->rst != NULL) {