]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/net/irda/irport.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6-omap-h63xx.git] / drivers / net / irda / irport.c
index 654a68b490ae6011f7810e968c8426e382b69872..20732458f5ac20cb41cea01cfe14e5ae5d2ce2c8 100644 (file)
@@ -164,14 +164,13 @@ irport_open(int i, unsigned int iobase, unsigned int irq)
        
        /* Allocate memory if needed */
        if (self->tx_buff.truesize > 0) {
-               self->tx_buff.head = (__u8 *) kmalloc(self->tx_buff.truesize, 
+               self->tx_buff.head = kzalloc(self->tx_buff.truesize,
                                                      GFP_KERNEL);
                if (self->tx_buff.head == NULL) {
                        IRDA_ERROR("%s(), can't allocate memory for "
                                   "transmit buffer!\n", __FUNCTION__);
                        goto err_out4;
                }
-               memset(self->tx_buff.head, 0, self->tx_buff.truesize);
        }       
        self->tx_buff.data = self->tx_buff.head;
 
@@ -509,7 +508,7 @@ static void irport_timeout(struct net_device *dev)
        IRDA_DEBUG(0, "%s(), iir=%02x, lsr=%02x, iobase=%#x\n", 
                   __FUNCTION__, iir, lsr, iobase);
 
-       IRDA_DEBUG(0, "%s(), transmitting=%d, remain=%d, done=%d\n", 
+       IRDA_DEBUG(0, "%s(), transmitting=%d, remain=%d, done=%td\n",
                   __FUNCTION__, self->transmitting, self->tx_buff.len,
                   self->tx_buff.data - self->tx_buff.head);