git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bd5ba3b
)
[media] zoran: use video_device_alloc instead of kmalloc
author
Hans Verkuil
<hverkuil@xs4all.nl>
Fri, 31 Dec 2010 14:28:51 +0000
(11:28 -0300)
committer
Mauro Carvalho Chehab
<mchehab@redhat.com>
Wed, 19 Jan 2011 13:52:12 +0000
(11:52 -0200)
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/zoran/zoran_card.c
patch
|
blob
|
history
diff --git
a/drivers/media/video/zoran/zoran_card.c
b/drivers/media/video/zoran/zoran_card.c
index
9cdc3bb
..
9f2bac5
100644
(file)
--- a/
drivers/media/video/zoran/zoran_card.c
+++ b/
drivers/media/video/zoran/zoran_card.c
@@
-1041,7
+1041,7
@@
zr36057_init (struct zoran *zr)
/* allocate memory *before* doing anything to the hardware
* in case allocation fails */
zr->stat_com = kzalloc(BUZ_NUM_STAT_COM * 4, GFP_KERNEL);
- zr->video_dev =
kmalloc(sizeof(struct video_device), GFP_KERNEL
);
+ zr->video_dev =
video_device_alloc(
);
if (!zr->stat_com || !zr->video_dev) {
dprintk(1,
KERN_ERR