aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-12-31 11:28:51 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-01-19 11:52:12 -0200
commit6ce3ced4f73e3f0c345f47dc99fd21f2248724a8 (patch)
tree472377dcecb2c0c18df61fa9759c8171a8b2c9ed /drivers/media
parentbd5ba3ba2ead7248124723dac2481d0992e75e91 (diff)
downloadkernel_samsung_tuna-6ce3ced4f73e3f0c345f47dc99fd21f2248724a8.zip
kernel_samsung_tuna-6ce3ced4f73e3f0c345f47dc99fd21f2248724a8.tar.gz
kernel_samsung_tuna-6ce3ced4f73e3f0c345f47dc99fd21f2248724a8.tar.bz2
[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')
-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 9cdc3bb..9f2bac5 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