1 files changed, 18 insertions, 3 deletions

diff --git a/drivers/media/video/tm6000/tm6000-dvb.c b/drivers/media/video/tm6000/tm6000-dvb.c
index 5e6c129a4beb..e1f3f66e1e63 100644
--- a/drivers/media/video/tm6000/tm6000-dvb.c
+++ b/drivers/media/video/tm6000/tm6000-dvb.c
@@ -89,9 +89,19 @@ static void tm6000_urb_received(struct urb *urb)
         int ret;
         struct tm6000_core *dev = urb->context;
 
-        if (urb->status != 0)
+        switch (urb->status) {
+        case 0:
+        case -ETIMEDOUT:
+                break;
+        case -ENOENT:
+        case -ECONNRESET:
+        case -ESHUTDOWN:
+                return;
+        default:
                 print_err_status(dev, 0, urb->status);
-        else if (urb->actual_length > 0)
+        }
+
+        if (urb->actual_length > 0)
                 dvb_dmx_swfilter(&dev->dvb->demux, urb->transfer_buffer,
                                                    urb->actual_length);
 
@@ -151,7 +161,7 @@ static int tm6000_start_stream(struct tm6000_core *dev)
                 printk(KERN_ERR "tm6000: pipe resetted\n");
 
 /*      mutex_lock(&tm6000_driver.open_close_mutex); */
-        ret = usb_submit_urb(dvb->bulk_urb, GFP_KERNEL);
+        ret = usb_submit_urb(dvb->bulk_urb, GFP_ATOMIC);
 
 /*      mutex_unlock(&tm6000_driver.open_close_mutex); */
         if (ret) {
@@ -396,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");