]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
irda: fix overly long udelay()
authorArnd Bergmann <arnd@arndb.de>
Thu, 24 Nov 2016 16:26:22 +0000 (17:26 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Nov 2016 00:59:50 +0000 (19:59 -0500)
irda_get_mtt() returns a hardcoded '10000' in some cases,
and with gcc-7, we get a build error because this triggers a
compile-time check in udelay():

drivers/net/irda/w83977af_ir.o: In function `w83977af_hard_xmit':
w83977af_ir.c:(.text.w83977af_hard_xmit+0x14c): undefined reference to `__bad_udelay'

Older compilers did not run into this because they either did not
completely inline the irda_get_mtt() or did not consider the
10000 value a constant expression.

The code has been wrong since the start of git history.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/irda/w83977af_ir.c

index 4e3d2e7c697c76f483eb264b1c5da9244eb434c6..e8c3a8c32534b41d3e44397217da9ae68565b95d 100644 (file)
@@ -518,7 +518,9 @@ static netdev_tx_t w83977af_hard_xmit(struct sk_buff *skb,
                
                mtt = irda_get_mtt(skb);
                pr_debug("%s(%ld), mtt=%d\n", __func__ , jiffies, mtt);
-                       if (mtt)
+                       if (mtt > 1000)
+                               mdelay(mtt/1000);
+                       else if (mtt)
                                udelay(mtt);
 
                        /* Enable DMA interrupt */