- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / drivers / net / irda / vlsi_ir.c

diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 209d4bc..c3d0738 100644 (file)
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -1037,7 +1037,6 @@ static netdev_tx_t vlsi_hard_start_xmit(struct sk_buff *skb,
                wmb();
                outw(0, iobase+VLSI_PIO_PROMPT);
        }
-       ndev->trans_start = jiffies;
 
        if (ring_put(r) == NULL) {
                netif_stop_queue(ndev);
@@ -1742,7 +1741,7 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
        vlsi_irda_dev_t *idev;
 
        if (!ndev) {
-               IRDA_ERROR("%s - %s: no netdevice \n",
+               IRDA_ERROR("%s - %s: no netdevice\n",
                           __func__, pci_name(pdev));
                return 0;
        }
@@ -1781,7 +1780,7 @@ static int vlsi_irda_resume(struct pci_dev *pdev)
        vlsi_irda_dev_t *idev;
 
        if (!ndev) {
-               IRDA_ERROR("%s - %s: no netdevice \n",
+               IRDA_ERROR("%s - %s: no netdevice\n",
                           __func__, pci_name(pdev));
                return 0;
        }