summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zoran
diff options
context:
space:
mode:
authorHans Verkuil2010-12-31 15:28:51 +0100
committerMauro Carvalho Chehab2011-01-19 14:52:12 +0100
commit6ce3ced4f73e3f0c345f47dc99fd21f2248724a8 (patch)
tree472377dcecb2c0c18df61fa9759c8171a8b2c9ed /drivers/media/video/zoran
parent[media] w9966: zero device state after a detach (diff)
downloadkernel-qcow2-linux-6ce3ced4f73e3f0c345f47dc99fd21f2248724a8.tar.gz
kernel-qcow2-linux-6ce3ced4f73e3f0c345f47dc99fd21f2248724a8.tar.xz
kernel-qcow2-linux-6ce3ced4f73e3f0c345f47dc99fd21f2248724a8.zip
[media] zoran: use video_device_alloc instead of kmalloc
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/zoran')
-rw-r--r--drivers/media/video/zoran/zoran_card.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index 9cdc3bb15b15..9f2bac519647 100644
--- 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