From a8d83990167f4b9f9c2ad9b308c8e49284046fbd Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Thu, 1 Jul 2010 01:52:33 -0300
Subject: [PATCH] --- yaml --- r: 202028 b: refs/heads/master c:
 7a12f4b50dad4fdffd218c6fba6b9564bf86185e h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/video/zoran/videocodec.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a1470f08883f..29a802da67cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd3172d7dabdac4545d8246da62b570b9acf8058
+refs/heads/master: 7a12f4b50dad4fdffd218c6fba6b9564bf86185e
diff --git a/trunk/drivers/media/video/zoran/videocodec.c b/trunk/drivers/media/video/zoran/videocodec.c
index cf24956f3204..c01071635290 100644
--- a/trunk/drivers/media/video/zoran/videocodec.c
+++ b/trunk/drivers/media/video/zoran/videocodec.c
@@ -107,15 +107,14 @@ videocodec_attach (struct videocodec_master *master)
 			if (!try_module_get(h->codec->owner))
 				return NULL;
 
-			codec =
-			    kmalloc(sizeof(struct videocodec), GFP_KERNEL);
+			codec = kmemdup(h->codec, sizeof(struct videocodec),
+					GFP_KERNEL);
 			if (!codec) {
 				dprintk(1,
 					KERN_ERR
 					"videocodec_attach: no mem\n");
 				goto out_module_put;
 			}
-			memcpy(codec, h->codec, sizeof(struct videocodec));
 
 			snprintf(codec->name, sizeof(codec->name),
 				 "%s[%d]", codec->name, h->attached);