redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[PATCH] Fix zoran_card compilation warning

Browse source 
Fix the following warning which was introduced in 2.6.15-git8 by
commit 7408187d22:

  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>
This commit is contained in:
Jean Delvare 2006-01-15 13:13:13 +01:00 committed by Linus Torvalds
parent fc03da1ca1
commit 69ff56c166
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/media/video/zoran_card.c
View file

@ -995,7 +995,7 @@ test_interrupts (struct zoran *zr)
static int __devinit static int __devinit
zr36057_init (struct zoran *zr) zr36057_init (struct zoran *zr)
{ {
unsigned long mem; u32 *mem;
void *vdev; void *vdev;
unsigned mem_needed; unsigned mem_needed;
int j; int j;
@ -1058,10 +1058,10 @@ zr36057_init (struct zoran *zr)
"%s: zr36057_init() - kmalloc (STAT_COM) failed\n", "%s: zr36057_init() - kmalloc (STAT_COM) failed\n",
ZR_DEVNAME(zr)); ZR_DEVNAME(zr));
kfree(vdev); kfree(vdev);
kfree((void *)mem); kfree(mem);
return -ENOMEM; return -ENOMEM;
} }
zr->stat_com = (u32 *) mem; zr->stat_com = mem;
for (j = 0; j < BUZ_NUM_STAT_COM; j++) { for (j = 0; j < BUZ_NUM_STAT_COM; j++) {
zr->stat_com[j] = 1; /* mark as unavailable to zr36057 */ zr->stat_com[j] = 1; /* mark as unavailable to zr36057 */
} }