Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9bd2823 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 147fd287
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -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 */