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

[mv-sheeva.git] / drivers / staging / spectra / lld_emu.c

diff --git a/drivers/staging/spectra/lld_emu.c b/drivers/staging/spectra/lld_emu.c
index 6733bbf8016db0e14c1d917ffe385f00394eda94..095f2f0c2e5b9b6c0262567a09c403288f108d00 100644 (file)
--- a/drivers/staging/spectra/lld_emu.c
+++ b/drivers/staging/spectra/lld_emu.c
@@ -180,10 +180,8 @@ u16 emu_Flash_Init(void)
        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
                       __FILE__, __LINE__, __func__);
 
-       flash_memory[0] = (u8 *)vmalloc(GLOB_LLD_PAGE_SIZE *
-                                                  GLOB_LLD_BLOCKS *
-                                                  GLOB_LLD_PAGES *
-                                                  sizeof(u8));
+       flash_memory[0] = vmalloc(GLOB_LLD_PAGE_SIZE * GLOB_LLD_BLOCKS *
+                                 GLOB_LLD_PAGES * sizeof(u8));
        if (!flash_memory[0]) {
                printk(KERN_ERR "Fail to allocate memory "
                       "for nand emulator!\n");