From ade38f2f1c69f6809cd4bf9f70450d3f6fd5dbeb Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Fri, 18 Sep 2009 20:09:52 -0300
Subject: [PATCH] --- yaml --- r: 164269 b: refs/heads/master c:
 1601fb14980b1295e00087460d57256a87f334bf h: refs/heads/master i:   164267:
 bfad80ce14ee95d6647285fc8067ed135029871d v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/dvb/dvb-usb/m920x.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fa32669488d4..5307e61a9931 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34e383dd13edf402e87bf0a87f4a19b193b4bd7a
+refs/heads/master: 1601fb14980b1295e00087460d57256a87f334bf
diff --git a/trunk/drivers/media/dvb/dvb-usb/m920x.c b/trunk/drivers/media/dvb/dvb-usb/m920x.c
index aec7a1943b66..ef9b7bed13ff 100644
--- a/trunk/drivers/media/dvb/dvb-usb/m920x.c
+++ b/trunk/drivers/media/dvb/dvb-usb/m920x.c
@@ -337,6 +337,8 @@ static int m920x_firmware_download(struct usb_device *udev, const struct firmwar
 	int i, pass, ret = 0;
 
 	buff = kmalloc(65536, GFP_KERNEL);
+	if (buff == NULL)
+		return -ENOMEM;
 
 	if ((ret = m920x_read(udev, M9206_FILTER, 0x0, 0x8000, read, 4)) != 0)
 		goto done;