Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[~andy/linux] / drivers / media / dvb / dvb-usb / m920x.c

diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index aec7a1943b668c9d9152878d48850dbd56e00b7c..ef9b7bed13ffe84538b3e47f27d1e07bf8ff26bd 100644 (file)
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/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;