Merge branch 'linux-2.6' into for-2.6.22

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/videocodec.c
index 290e64135650..f2bbd7a4d562 100644
--- a/drivers/media/video/videocodec.c
+++ b/drivers/media/video/videocodec.c
@@ -348,6 +348,9 @@ videocodec_build_table (void)
         kfree(videocodec_buf);
         videocodec_buf = kmalloc(size, GFP_KERNEL);
 
+        if (!videocodec_buf)
+                return 0;
+
         i = 0;
         i += scnprintf(videocodec_buf + i, size - 1,
                       "<S>lave or attached <M>aster name  type flags    magic    ");