diff --git a/[refs] b/[refs]
index 2c7aebf6615f..e2be641a0167 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c3f53ec491b64b3c3fa339e4e77e49782b0be9f
+refs/heads/master: 2cd4fd1e57cb6897612ead8a3d39ecb444920a1a
diff --git a/trunk/drivers/staging/tm6000/tm6000-cards.c b/trunk/drivers/staging/tm6000/tm6000-cards.c
index da2348e1c048..df973c0cc46a 100644
--- a/trunk/drivers/staging/tm6000/tm6000-cards.c
+++ b/trunk/drivers/staging/tm6000/tm6000-cards.c
@@ -229,11 +229,15 @@ static int tm6000_usb_probe(struct usb_interface *interface,
 
 	/* Increment usage count */
 	tm6000_devused|=1<<nr;
+	snprintf(dev->name, 29, "tm6000 #%d", nr);
+
+	dev->model=id->driver_info;
+	if ((card[nr]>=0) && (card[nr]<ARRAY_SIZE(tm6000_boards))) {
+		dev->model=card[nr];
+	}
 
 	INIT_LIST_HEAD(&dev->tm6000_corelist);
 	dev->udev= usbdev;
-	dev->model=id->driver_info;
-	snprintf(dev->name, 29, "tm6000 #%d", nr);
 	dev->devno=nr;
 
 	switch (usbdev->speed) {
diff --git a/trunk/drivers/staging/tm6000/tm6000-video.c b/trunk/drivers/staging/tm6000/tm6000-video.c
index 68002a14ef3d..5697be06ddd7 100644
--- a/trunk/drivers/staging/tm6000/tm6000-video.c
+++ b/trunk/drivers/staging/tm6000/tm6000-video.c
@@ -591,7 +591,7 @@ static int tm6000_start_thread( struct tm6000_dmaqueue  *dma_q,
 
 	/* submit urbs and enables IRQ */
 	for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
-		rc = usb_submit_urb(dev->isoc_ctl.urb[i], GFP_KERNEL);
+		rc = usb_submit_urb(dev->isoc_ctl.urb[i], GFP_ATOMIC);
 		if (rc) {
 			tm6000_err("submit of urb %i failed (error=%i)\n", i,
 				   rc);