From owner-svn-src-user@FreeBSD.ORG  Mon Nov 15 21:19:50 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6456E1065673;
	Mon, 15 Nov 2010 21:19:50 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 537DB8FC08;
	Mon, 15 Nov 2010 21:19:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAFLJoZm028898;
	Mon, 15 Nov 2010 21:19:50 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAFLJopB028896;
	Mon, 15 Nov 2010 21:19:50 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <201011152119.oAFLJopB028896@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Mon, 15 Nov 2010 21:19:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215346 - user/weongyo/usb/sys/dev/usb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Nov 2010 21:19:50 -0000

Author: weongyo
Date: Mon Nov 15 21:19:50 2010
New Revision: 215346
URL: http://svn.freebsd.org/changeset/base/215346

Log:
  Stopping / draining the callout should happen first to make sure that
  the task wouldn't be enqueued during stopping the taskqueue.
  
  Pointed by:	hps

Modified:
  user/weongyo/usb/sys/dev/usb/usb_sleepout.c

Modified: user/weongyo/usb/sys/dev/usb/usb_sleepout.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_sleepout.c	Mon Nov 15 19:55:19 2010	(r215345)
+++ user/weongyo/usb/sys/dev/usb/usb_sleepout.c	Mon Nov 15 21:19:50 2010	(r215346)
@@ -109,20 +109,31 @@ int
 sleepout_stop(struct sleepout_task *st)
 {
 	struct sleepout *s = st->st_sleepout;
+	int ret;
+
+	ret = callout_stop(&st->st_callout);
 
 	/*
 	 * XXX the return value is ignored but one thing clear is that the task
 	 * isn't on the task queue list after this moment.
 	 */
 	(void)taskqueue_cancel(s->s_taskqueue, &st->st_task, NULL);
-	return (callout_stop(&st->st_callout));
+
+	return (ret);
 }
 
 int
 sleepout_drain(struct sleepout_task *st)
 {
 	struct sleepout *s = st->st_sleepout;
+	int ret;
 
+	/*
+	 * Always the sequence to stop / drain a sleepout is that callout(9)
+	 * should be handled first to make sure that it's not enqueued at
+	 * the task list.
+	 */
+	ret = callout_drain(&st->st_callout);
 	taskqueue_drain(s->s_taskqueue, &st->st_task);
-	return (callout_drain(&st->st_callout));
+	return (ret);
 }