diff --git a/[refs] b/[refs]
index 1104e639e5b9..ee072fea1e87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3874cd7796ef1a03cd6d2a2d886e3ac4c35af09c
+refs/heads/master: c81c0060acff726dc582185da303b3057d780af7
diff --git a/trunk/drivers/media/video/tm6000/tm6000-dvb.c b/trunk/drivers/media/video/tm6000/tm6000-dvb.c
index db6a561bca3e..e1f3f66e1e63 100644
--- a/trunk/drivers/media/video/tm6000/tm6000-dvb.c
+++ b/trunk/drivers/media/video/tm6000/tm6000-dvb.c
@@ -406,6 +406,11 @@ static int dvb_init(struct tm6000_core *dev)
 	if (!dev->caps.has_dvb)
 		return 0;
 
+	if (dev->udev->speed == USB_SPEED_FULL) {
+		printk(KERN_INFO "This USB2.0 device cannot be run on a USB1.1 port. (it lacks a hardware PID filter)\n");
+		return 0;
+	}
+
 	dvb = kzalloc(sizeof(struct tm6000_dvb), GFP_KERNEL);
 	if (!dvb) {
 		printk(KERN_INFO "Cannot allocate memory\n");