diff options
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/zoran_card.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c index ea3288661a34..246e67cd8b51 100644 --- a/drivers/media/video/zoran_card.c +++ b/drivers/media/video/zoran_card.c | |||
@@ -995,7 +995,7 @@ test_interrupts (struct zoran *zr) | |||
995 | static int __devinit | 995 | static int __devinit |
996 | zr36057_init (struct zoran *zr) | 996 | zr36057_init (struct zoran *zr) |
997 | { | 997 | { |
998 | unsigned long mem; | 998 | u32 *mem; |
999 | void *vdev; | 999 | void *vdev; |
1000 | unsigned mem_needed; | 1000 | unsigned mem_needed; |
1001 | int j; | 1001 | int j; |
@@ -1058,10 +1058,10 @@ zr36057_init (struct zoran *zr) | |||
1058 | "%s: zr36057_init() - kmalloc (STAT_COM) failed\n", | 1058 | "%s: zr36057_init() - kmalloc (STAT_COM) failed\n", |
1059 | ZR_DEVNAME(zr)); | 1059 | ZR_DEVNAME(zr)); |
1060 | kfree(vdev); | 1060 | kfree(vdev); |
1061 | kfree((void *)mem); | 1061 | kfree(mem); |
1062 | return -ENOMEM; | 1062 | return -ENOMEM; |
1063 | } | 1063 | } |
1064 | zr->stat_com = (u32 *) mem; | 1064 | zr->stat_com = mem; |
1065 | for (j = 0; j < BUZ_NUM_STAT_COM; j++) { | 1065 | for (j = 0; j < BUZ_NUM_STAT_COM; j++) { |
1066 | zr->stat_com[j] = 1; /* mark as unavailable to zr36057 */ | 1066 | zr->stat_com[j] = 1; /* mark as unavailable to zr36057 */ |
1067 | } | 1067 | } |