diff options
Diffstat (limited to 'drivers/net/irda/vlsi_ir.c')
-rw-r--r-- | drivers/net/irda/vlsi_ir.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index 209d4bcfaced..c3d07382b7fa 100644 --- 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, | |||
1037 | wmb(); | 1037 | wmb(); |
1038 | outw(0, iobase+VLSI_PIO_PROMPT); | 1038 | outw(0, iobase+VLSI_PIO_PROMPT); |
1039 | } | 1039 | } |
1040 | ndev->trans_start = jiffies; | ||
1041 | 1040 | ||
1042 | if (ring_put(r) == NULL) { | 1041 | if (ring_put(r) == NULL) { |
1043 | netif_stop_queue(ndev); | 1042 | netif_stop_queue(ndev); |
@@ -1742,7 +1741,7 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state) | |||
1742 | vlsi_irda_dev_t *idev; | 1741 | vlsi_irda_dev_t *idev; |
1743 | 1742 | ||
1744 | if (!ndev) { | 1743 | if (!ndev) { |
1745 | IRDA_ERROR("%s - %s: no netdevice \n", | 1744 | IRDA_ERROR("%s - %s: no netdevice\n", |
1746 | __func__, pci_name(pdev)); | 1745 | __func__, pci_name(pdev)); |
1747 | return 0; | 1746 | return 0; |
1748 | } | 1747 | } |
@@ -1781,7 +1780,7 @@ static int vlsi_irda_resume(struct pci_dev *pdev) | |||
1781 | vlsi_irda_dev_t *idev; | 1780 | vlsi_irda_dev_t *idev; |
1782 | 1781 | ||
1783 | if (!ndev) { | 1782 | if (!ndev) { |
1784 | IRDA_ERROR("%s - %s: no netdevice \n", | 1783 | IRDA_ERROR("%s - %s: no netdevice\n", |
1785 | __func__, pci_name(pdev)); | 1784 | __func__, pci_name(pdev)); |
1786 | return 0; | 1785 | return 0; |
1787 | } | 1786 | } |