Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / videocodec.c

diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/videocodec.c
index 2ae3fb250630be9dd7f51dfa82e6b61e36375ae1..f2bbd7a4d562850ffb306c584b61a10b9b2ab330 100644 (file)
--- a/drivers/media/video/videocodec.c
+++ b/drivers/media/video/videocodec.c
@@ -346,7 +346,10 @@ videocodec_build_table (void)
                size);
 
        kfree(videocodec_buf);
-       videocodec_buf = (char *) kmalloc(size, GFP_KERNEL);
+       videocodec_buf = kmalloc(size, GFP_KERNEL);
+
+       if (!videocodec_buf)
+               return 0;
 
        i = 0;
        i += scnprintf(videocodec_buf + i, size - 1,