From 7fc43f10ae5a8b9836b6298e9c80d4710f261ff0 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Tue, 22 Apr 2008 14:45:45 -0300
Subject: [PATCH] --- yaml --- r: 92455 b: refs/heads/master c:
 8f59100a42576c49e2170e9dc04f8b7ac922a74d h: refs/heads/master i:   92453:
 c9423eba6b79c8cb011297ae9ec529a19fa2db64   92451:
 0aa55a5af8371acdc6181a31bf68afec3f644582   92447:
 138d3d2a7db7a35c53c4548b3c229f7098027f4b v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c68d2824b77b..51f2bbcacb84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4a8828ddbf5fb445d2679ab006d5743540fc41a
+refs/heads/master: 8f59100a42576c49e2170e9dc04f8b7ac922a74d
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index f2d2677936b3..1dff2d04a5d9 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2114,13 +2114,13 @@ void pvr2_hdw_destroy(struct pvr2_hdw *hdw)
 {
 	if (!hdw) return;
 	pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_destroy: hdw=%p",hdw);
-	del_timer_sync(&hdw->quiescent_timer);
-	del_timer_sync(&hdw->encoder_wait_timer);
 	if (hdw->workqueue) {
 		flush_workqueue(hdw->workqueue);
 		destroy_workqueue(hdw->workqueue);
 		hdw->workqueue = NULL;
 	}
+	del_timer_sync(&hdw->quiescent_timer);
+	del_timer_sync(&hdw->encoder_wait_timer);
 	if (hdw->fw_buffer) {
 		kfree(hdw->fw_buffer);
 		hdw->fw_buffer = NULL;