---

yaml --- r: 202028 b: refs/heads/master c: 7a12f4b h: refs/heads/master v: v3
git-mirror · Aug 2, 2010 · a8d8399 · a8d8399
1 parent 238bb2f
commit a8d8399
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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);