Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69ff56c1 authored by Jean Delvare's avatar Jean Delvare Committed by Linus Torvalds
Browse files

[PATCH] Fix zoran_card compilation warning 



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

  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: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarRonald S. Bultje <rbultje@ronald.bitfreak.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fc03da1c

drivers/media/video/zoran_card.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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 */

	}