Merge tag 'md-3.3' of git://neil.brown.name/md

[karo-tx-linux.git] / drivers / net / irda / via-ircc.c

diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index 6d6479049aa119b70eb6ce2ff2856d0d886e6f15..2d456dd164fb0e26a82e02d2c0142e1d2d4414c7 100644 (file)
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -942,14 +942,14 @@ static int via_ircc_dma_xmit_complete(struct via_ircc_cb *self)
        iobase = self->io.fir_base;
        /* Disable DMA */
 //      DisableDmaChannel(self->io.dma);
-       /* Check for underrrun! */
+       /* Check for underrun! */
        /* Clear bit, by writing 1 into it */
        Tx_status = GetTXStatus(iobase);
        if (Tx_status & 0x08) {
                self->netdev->stats.tx_errors++;
                self->netdev->stats.tx_fifo_errors++;
                hwreset(self);
-// how to clear underrrun ?
+       /* how to clear underrun? */
        } else {
                self->netdev->stats.tx_packets++;
                ResetChip(iobase, 3);