Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / cx231xx / cx231xx-417.c

diff --git a/drivers/media/video/cx231xx/cx231xx-417.c b/drivers/media/video/cx231xx/cx231xx-417.c
index 4c7cac3b6254eb9ed0b9ca7c47bd525d12cc1c81..fc9526a5b7469483203b2e776c0cb3f05735f614 100644 (file)
--- a/drivers/media/video/cx231xx/cx231xx-417.c
+++ b/drivers/media/video/cx231xx/cx231xx-417.c
@@ -940,14 +940,14 @@ static int cx231xx_load_firmware(struct cx231xx *dev)
        u16 _buffer_size = 4096;
        u8 *p_buffer;
 
-       p_current_fw = (u32 *)vmalloc(1884180*4);
+       p_current_fw = vmalloc(1884180 * 4);
        p_fw = p_current_fw;
        if (p_current_fw == 0) {
                dprintk(2, "FAIL!!!\n");
                return -1;
        }
 
-       p_buffer = (u8 *)vmalloc(4096);
+       p_buffer = vmalloc(4096);
        if (p_buffer == 0) {
                dprintk(2, "FAIL!!!\n");
                return -1;