diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-24 17:26:22 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-27 19:59:50 -0500 |
| commit | c9bd28233b6d0d82ac3ba0215723be0a8262c39c (patch) | |
| tree | 437fab5df65c5a4a95e46071b742b8fea005025f /drivers/net/irda | |
| parent | 147fd2874d8a8ba69970f0069d67ac341bf0bb09 (diff) | |
irda: fix overly long udelay()
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>
Diffstat (limited to 'drivers/net/irda')
| -rw-r--r-- | drivers/net/irda/w83977af_ir.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index 4e3d2e7c697c..e8c3a8c32534 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c @@ -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 */ |