From owner-svn-src-user@FreeBSD.ORG  Sun Nov 14 02:38:29 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 6FDF6106566B;
	Sun, 14 Nov 2010 02:38:29 +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 5E41E8FC17;
	Sun, 14 Nov 2010 02:38:29 +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 oAE2cTq2067592;
	Sun, 14 Nov 2010 02:38:29 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAE2cTAS067590;
	Sun, 14 Nov 2010 02:38:29 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <201011140238.oAE2cTAS067590@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Sun, 14 Nov 2010 02:38:29 +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: r215278 - 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: Sun, 14 Nov 2010 02:38:29 -0000

Author: weongyo
Date: Sun Nov 14 02:38:29 2010
New Revision: 215278
URL: http://svn.freebsd.org/changeset/base/215278

Log:
  Uses taskqueue_cancel(9) interface for sleepout_stop which is recently
  committed.

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	Sun Nov 14 02:35:57 2010	(r215277)
+++ user/weongyo/usb/sys/dev/usb/usb_sleepout.c	Sun Nov 14 02:38:29 2010	(r215278)
@@ -108,7 +108,13 @@ sleepout_pending(struct sleepout_task *s
 int
 sleepout_stop(struct sleepout_task *st)
 {
+	struct sleepout *s = st->st_sleepout;
 
+	/*
+	 * 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));
 }