diff options
Diffstat (limited to 'drivers/net/irda/smsc-ircc2.c')
-rw-r--r-- | drivers/net/irda/smsc-ircc2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index 8f7d0d146f24..35e4e44040a2 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c | |||
@@ -48,13 +48,13 @@ | |||
48 | #include <linux/netdevice.h> | 48 | #include <linux/netdevice.h> |
49 | #include <linux/ioport.h> | 49 | #include <linux/ioport.h> |
50 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
51 | #include <linux/slab.h> | ||
52 | #include <linux/init.h> | 51 | #include <linux/init.h> |
53 | #include <linux/rtnetlink.h> | 52 | #include <linux/rtnetlink.h> |
54 | #include <linux/serial_reg.h> | 53 | #include <linux/serial_reg.h> |
55 | #include <linux/dma-mapping.h> | 54 | #include <linux/dma-mapping.h> |
56 | #include <linux/pnp.h> | 55 | #include <linux/pnp.h> |
57 | #include <linux/platform_device.h> | 56 | #include <linux/platform_device.h> |
57 | #include <linux/gfp.h> | ||
58 | 58 | ||
59 | #include <asm/io.h> | 59 | #include <asm/io.h> |
60 | #include <asm/dma.h> | 60 | #include <asm/dma.h> |
@@ -868,7 +868,7 @@ static void smsc_ircc_timeout(struct net_device *dev) | |||
868 | spin_lock_irqsave(&self->lock, flags); | 868 | spin_lock_irqsave(&self->lock, flags); |
869 | smsc_ircc_sir_start(self); | 869 | smsc_ircc_sir_start(self); |
870 | smsc_ircc_change_speed(self, self->io.speed); | 870 | smsc_ircc_change_speed(self, self->io.speed); |
871 | dev->trans_start = jiffies; | 871 | dev->trans_start = jiffies; /* prevent tx timeout */ |
872 | netif_wake_queue(dev); | 872 | netif_wake_queue(dev); |
873 | spin_unlock_irqrestore(&self->lock, flags); | 873 | spin_unlock_irqrestore(&self->lock, flags); |
874 | } | 874 | } |