From owner-svn-src-all@freebsd.org  Tue Sep  8 19:41:20 2015
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 961D5A008DB;
 Tue,  8 Sep 2015 19:41:20 +0000 (UTC)
 (envelope-from dumbbell@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 86B021214;
 Tue,  8 Sep 2015 19:41:20 +0000 (UTC)
 (envelope-from dumbbell@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t88JfKEY061686;
 Tue, 8 Sep 2015 19:41:20 GMT (envelope-from dumbbell@FreeBSD.org)
Received: (from dumbbell@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t88JfKHp061685;
 Tue, 8 Sep 2015 19:41:20 GMT (envelope-from dumbbell@FreeBSD.org)
Message-Id: <201509081941.t88JfKHp061685@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dumbbell set sender to
 dumbbell@FreeBSD.org using -f
From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= <dumbbell@FreeBSD.org>
Date: Tue, 8 Sep 2015 19:41:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287573 - head/sys/dev/drm2/ttm
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.20
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: Tue, 08 Sep 2015 19:41:20 -0000

Author: dumbbell
Date: Tue Sep  8 19:41:19 2015
New Revision: 287573
URL: https://svnweb.freebsd.org/changeset/base/287573

Log:
  drm/ttm: Drain taskqueue if taskqueue_cancel_timeout() returned an error
  
  Before, this was done if `pending` was true. This is not what the
  manpage suggests and not what was done elsewhere in the same file.

Modified:
  head/sys/dev/drm2/ttm/ttm_bo.c

Modified: head/sys/dev/drm2/ttm/ttm_bo.c
==============================================================================
--- head/sys/dev/drm2/ttm/ttm_bo.c	Tue Sep  8 19:25:15 2015	(r287572)
+++ head/sys/dev/drm2/ttm/ttm_bo.c	Tue Sep  8 19:41:19 2015	(r287573)
@@ -789,8 +789,7 @@ int ttm_bo_lock_delayed_workqueue(struct
 {
 	int pending;
 
-	taskqueue_cancel_timeout(taskqueue_thread, &bdev->wq, &pending);
-	if (pending)
+	if (taskqueue_cancel_timeout(taskqueue_thread, &bdev->wq, &pending))
 		taskqueue_drain_timeout(taskqueue_thread, &bdev->wq);
 	return (pending);
 }