From owner-svn-src-all@FreeBSD.ORG  Thu Apr 24 05:04:55 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6DA0A706;
 Thu, 24 Apr 2014 05:04:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 5AB4B159C;
 Thu, 24 Apr 2014 05:04:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3O54tC8039094;
 Thu, 24 Apr 2014 05:04:55 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3O54tPT039093;
 Thu, 24 Apr 2014 05:04:55 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201404240504.s3O54tPT039093@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Thu, 24 Apr 2014 05:04:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264867 - head/sys/dev/virtio/random
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.17
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2014 05:04:55 -0000

Author: bryanv
Date: Thu Apr 24 05:04:54 2014
New Revision: 264867
URL: http://svnweb.freebsd.org/changeset/base/264867

Log:
  Wait for the callout to finish before unloading the module
  
  MFC after:	3 days

Modified:
  head/sys/dev/virtio/random/virtio_random.c

Modified: head/sys/dev/virtio/random/virtio_random.c
==============================================================================
--- head/sys/dev/virtio/random/virtio_random.c	Thu Apr 24 04:43:50 2014	(r264866)
+++ head/sys/dev/virtio/random/virtio_random.c	Thu Apr 24 05:04:54 2014	(r264867)
@@ -156,7 +156,7 @@ vtrnd_detach(device_t dev)
 
 	sc = device_get_softc(dev);
 
-	callout_stop(&sc->vtrnd_callout);
+	callout_drain(&sc->vtrnd_callout);
 
 	return (0);
 }