[PATCH] Fix zoran_card compilation warning

Fix the following warning which was introduced in 2.6.15-git8 by
commit 7408187d223f63d46a13b6a35b8f96b032c2f623:

CC [M] drivers/media/video/zoran_card.o
drivers/media/video/zoran_card.c: In function `zr36057_init':
drivers/media/video/zoran_card.c:1053: warning: assignment makes integer from pointer without a cast

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Ronald S. Bultje <rbultje@ronald.bitfreak.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Jean Delvare and committed by Linus Torvalds 69ff56c1 fc03da1c

+3 -3
+3 -3
drivers/media/video/zoran_card.c
··· 995 static int __devinit 996 zr36057_init (struct zoran *zr) 997 { 998 - unsigned long mem; 999 void *vdev; 1000 unsigned mem_needed; 1001 int j; ··· 1058 "%s: zr36057_init() - kmalloc (STAT_COM) failed\n", 1059 ZR_DEVNAME(zr)); 1060 kfree(vdev); 1061 - kfree((void *)mem); 1062 return -ENOMEM; 1063 } 1064 - zr->stat_com = (u32 *) mem; 1065 for (j = 0; j < BUZ_NUM_STAT_COM; j++) { 1066 zr->stat_com[j] = 1; /* mark as unavailable to zr36057 */ 1067 }
··· 995 static int __devinit 996 zr36057_init (struct zoran *zr) 997 { 998 + u32 *mem; 999 void *vdev; 1000 unsigned mem_needed; 1001 int j; ··· 1058 "%s: zr36057_init() - kmalloc (STAT_COM) failed\n", 1059 ZR_DEVNAME(zr)); 1060 kfree(vdev); 1061 + kfree(mem); 1062 return -ENOMEM; 1063 } 1064 + zr->stat_com = mem; 1065 for (j = 0; j < BUZ_NUM_STAT_COM; j++) { 1066 zr->stat_com[j] = 1; /* mark as unavailable to zr36057 */ 1067 }