From 4ff56624addb50c76155dfceab410a629de0e9df Mon Sep 17 00:00:00 2001
From: Alan Young <ayoung@teleport.com>
Date: Mon, 26 Jul 2010 08:50:32 -0300
Subject: [PATCH] --- yaml --- r: 219437 b: refs/heads/master c:
 39bcb3ae030b0b64262adf6c5243bf767d8b75dc h: refs/heads/master i:   219435:
 f405b3901eb3e4b2066248356d06c5802f935570 v: v3

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

diff --git a/[refs] b/[refs]
index 4df014af0cb1..428985d97ad0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe023ad15e4a9147c208e4c4cac98d7fd40ab0bd
+refs/heads/master: 39bcb3ae030b0b64262adf6c5243bf767d8b75dc
diff --git a/trunk/drivers/media/video/hdpvr/hdpvr-video.c b/trunk/drivers/media/video/hdpvr/hdpvr-video.c
index 761d7c5764d0..d38fe1043e47 100644
--- a/trunk/drivers/media/video/hdpvr/hdpvr-video.c
+++ b/trunk/drivers/media/video/hdpvr/hdpvr-video.c
@@ -26,7 +26,7 @@
 #include <media/v4l2-ioctl.h>
 #include "hdpvr.h"
 
-#define BULK_URB_TIMEOUT 1250 /* 1.25 seconds */
+#define BULK_URB_TIMEOUT   90 /* 0.09 seconds */
 
 #define print_buffer_status() { \
 		v4l2_dbg(MSG_BUFFER, hdpvr_debug, &dev->v4l2_dev,	\