vserver 1.9.3

[linux-2.6.git] / drivers / net / wan / sdladrv.c

diff --git a/drivers/net/wan/sdladrv.c b/drivers/net/wan/sdladrv.c
index 501e9a7..c8bc6da 100644 (file)
--- a/drivers/net/wan/sdladrv.c
+++ b/drivers/net/wan/sdladrv.c
@@ -937,7 +937,7 @@ int sdla_peek (sdlahw_t* hw, unsigned long addr, void* buf, unsigned len)
                         peek_by_4 ((unsigned long)hw->dpmbase + curpos, buf,
                                curlen);
                         addr       += curlen;
-                        (char*)buf += curlen;
+                        buf         = (char*)buf + curlen;
                         len        -= curlen;
                 }
 
@@ -1019,7 +1019,7 @@ int sdla_poke (sdlahw_t* hw, unsigned long addr, void* buf, unsigned len)
                         poke_by_4 ((unsigned long)hw->dpmbase + curpos, buf,
                                curlen);
                        addr       += curlen;
-                        (char*)buf += curlen;
+                        buf         = (char*)buf + curlen;
                         len        -= curlen;
                 }
 
@@ -2001,7 +2001,7 @@ static int detect_s514 (sdlahw_t* hw)
        (void *)hw->dpmbase = ioremap((unsigned long)S514_mem_base_addr,
                (unsigned long)MAX_SIZEOF_S514_MEMORY);
        /* map the physical control register memory to virtual memory */
-       (void *)hw->vector = ioremap(
+       hw->vector = (unsigned long)ioremap(
                (unsigned long)(S514_mem_base_addr + S514_CTRL_REG_BYTE),
                (unsigned long)16);