Skip to content

Commit

Permalink
[PATCH] Fix zoran_card compilation warning
Browse files Browse the repository at this point in the history
Fix the following warning which was introduced in 2.6.15-git8 by
commit 7408187:

  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>
  • Loading branch information
Jean Delvare authored and Linus Torvalds committed Jan 15, 2006
1 parent fc03da1 commit 69ff56c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/media/video/zoran_card.c
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ test_interrupts (struct zoran *zr)
static int __devinit
zr36057_init (struct zoran *zr)
{
unsigned long mem;
u32 *mem;
void *vdev;
unsigned mem_needed;
int j;
Expand Down Expand Up @@ -1058,10 +1058,10 @@ zr36057_init (struct zoran *zr)
"%s: zr36057_init() - kmalloc (STAT_COM) failed\n",
ZR_DEVNAME(zr));
kfree(vdev);
kfree((void *)mem);
kfree(mem);
return -ENOMEM;
}
zr->stat_com = (u32 *) mem;
zr->stat_com = mem;
for (j = 0; j < BUZ_NUM_STAT_COM; j++) {
zr->stat_com[j] = 1; /* mark as unavailable to zr36057 */
}
Expand Down

0 comments on commit 69ff56c

Please sign in to comment.