diff options
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index f2d2677936b..1dff2d04a5d 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c | |||
@@ -2114,13 +2114,13 @@ void pvr2_hdw_destroy(struct pvr2_hdw *hdw) | |||
2114 | { | 2114 | { |
2115 | if (!hdw) return; | 2115 | if (!hdw) return; |
2116 | pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_destroy: hdw=%p",hdw); | 2116 | pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_destroy: hdw=%p",hdw); |
2117 | del_timer_sync(&hdw->quiescent_timer); | ||
2118 | del_timer_sync(&hdw->encoder_wait_timer); | ||
2119 | if (hdw->workqueue) { | 2117 | if (hdw->workqueue) { |
2120 | flush_workqueue(hdw->workqueue); | 2118 | flush_workqueue(hdw->workqueue); |
2121 | destroy_workqueue(hdw->workqueue); | 2119 | destroy_workqueue(hdw->workqueue); |
2122 | hdw->workqueue = NULL; | 2120 | hdw->workqueue = NULL; |
2123 | } | 2121 | } |
2122 | del_timer_sync(&hdw->quiescent_timer); | ||
2123 | del_timer_sync(&hdw->encoder_wait_timer); | ||
2124 | if (hdw->fw_buffer) { | 2124 | if (hdw->fw_buffer) { |
2125 | kfree(hdw->fw_buffer); | 2125 | kfree(hdw->fw_buffer); |
2126 | hdw->fw_buffer = NULL; | 2126 | hdw->fw_buffer = NULL; |