3 files changed, 3 insertions, 8 deletions

diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c
index 294e9cb0c449..0ce96670f979 100644
--- a/drivers/char/rio/rio_linux.c
+++ b/drivers/char/rio/rio_linux.c
@@ -803,9 +803,7 @@ static void *ckmalloc(int size)
 {
         void *p;
 
-        p = kmalloc(size, GFP_KERNEL);
-        if (p)
-                memset(p, 0, size);
+        p = kzalloc(size, GFP_KERNEL);
         return p;
 }
 
diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c
index 8cc60b693460..7321d002c34f 100644
--- a/drivers/char/rio/riocmd.c
+++ b/drivers/char/rio/riocmd.c
@@ -556,9 +556,7 @@ struct CmdBlk *RIOGetCmdBlk(void)
 {
         struct CmdBlk *CmdBlkP;
 
-        CmdBlkP = kmalloc(sizeof(struct CmdBlk), GFP_ATOMIC);
-        if (CmdBlkP)
-                memset(CmdBlkP, 0, sizeof(struct CmdBlk));
+        CmdBlkP = kzalloc(sizeof(struct CmdBlk), GFP_ATOMIC);
         return CmdBlkP;
 }
 
diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c
index 7e988357326e..991119c9f473 100644
--- a/drivers/char/rio/riotable.c
+++ b/drivers/char/rio/riotable.c
@@ -863,8 +863,7 @@ int RIOReMapPorts(struct rio_info *p, struct Host *HostP, struct Map *HostMapP)
                 if (PortP->TxRingBuffer)
                         memset(PortP->TxRingBuffer, 0, p->RIOBufferSize);
                 else if (p->RIOBufferSize) {
-                        PortP->TxRingBuffer = kmalloc(p->RIOBufferSize, GFP_KERNEL);
-                        memset(PortP->TxRingBuffer, 0, p->RIOBufferSize);
+                        PortP->TxRingBuffer = kzalloc(p->RIOBufferSize, GFP_KERNEL);
                 }
                 PortP->TxBufferOut = 0;
                 PortP->TxBufferIn = 0;