From 3caabcfc78f0ba5b59829e8f1801a90c811c81b8 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Fri, 28 Mar 2008 05:31:40 -0300
Subject: [PATCH] --- yaml --- r: 92769 b: refs/heads/master c:
 b9a37d9124dc834f2448558dbbe766eee077b954 h: refs/heads/master i:   92767:
 3f2a3a77d622b0a74359720d8b20d84769561614 v: v3

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

diff --git a/[refs] b/[refs]
index 8bcedd1ffb1e..3fd840d4fdae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38d9a2cf2db30b37dde81ec5f8b4de0fd9843ccc
+refs/heads/master: b9a37d9124dc834f2448558dbbe766eee077b954
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 307a38d91c85..4329e4366f9f 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -3796,7 +3796,7 @@ static unsigned int pvr2_hdw_report_unlocked(struct pvr2_hdw *hdw,int which,
 			(hdw->state_encoder_config ?
 			 " <encode:configok>" :
 			 (hdw->state_encoder_waitok ?
-			  "" : " <encode:wait>")),
+			  "" : " <encode:waitok>")),
 			(hdw->state_usbstream_run ?
 			 " <usb:run>" : " <usb:stop>"),
 			(hdw->state_pathway_ok ?