diff --git a/[refs] b/[refs]
index 608de472a32c..22f858abdf7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de03277d6ae26d09b3af8617f291c4bb3db7d2eb
+refs/heads/master: 88b404c435ffb6c103faf85cc1b41077dcd03bf9
diff --git a/trunk/drivers/media/usb/tm6000/tm6000-core.c b/trunk/drivers/media/usb/tm6000/tm6000-core.c
index 22cc0116deb6..7c32353c59db 100644
--- a/trunk/drivers/media/usb/tm6000/tm6000-core.c
+++ b/trunk/drivers/media/usb/tm6000/tm6000-core.c
@@ -40,10 +40,13 @@ int tm6000_read_write_usb(struct tm6000_core *dev, u8 req_type, u8 req,
 	u8	     *data = NULL;
 	int delay = 5000;
 
-	mutex_lock(&dev->usb_lock);
-
-	if (len)
+	if (len) {
 		data = kzalloc(len, GFP_KERNEL);
+		if (!data)
+			return -ENOMEM;
+	}
+
+	mutex_lock(&dev->usb_lock);
 
 	if (req_type & USB_DIR_IN)
 		pipe = usb_rcvctrlpipe(dev->udev, 0);