lkml.org 
[lkml]   [2006]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH] Fix zoran_card compilation warning
    Hi Linus, all,

    Can we get this one merged before 2.6.16-rc1 please? Thanks.

    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>
    ---
    drivers/media/video/zoran_card.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- linux-2.6.15-git.orig/drivers/media/video/zoran_card.c 2006-01-12 20:34:54.000000000 +0100
    +++ linux-2.6.15-git/drivers/media/video/zoran_card.c 2006-01-12 20:47:26.000000000 +0100
    @@ -995,7 +995,7 @@
    static int __devinit
    zr36057_init (struct zoran *zr)
    {
    - unsigned long mem;
    + u32 *mem;
    void *vdev;
    unsigned mem_needed;
    int j;
    @@ -1058,10 +1058,10 @@
    "%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 */
    }

    --
    Jean Delvare
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-01-15 13:15    [W:0.021 / U:30.092 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site