Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

[~andy/linux] / drivers / tty / moxa.c

diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index ba679ce0a77456b1ecbeb6e674b67fbbb4ab1dac..d15a071b1a54c54099a9e17cc67f6f4837e8a68c 100644 (file)
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -44,6 +44,7 @@
 #include <linux/init.h>
 #include <linux/bitops.h>
 #include <linux/slab.h>
+#include <linux/ratelimit.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -242,8 +243,8 @@ static void moxa_wait_finish(void __iomem *ofsAddr)
        while (readw(ofsAddr + FuncCode) != 0)
                if (time_after(jiffies, end))
                        return;
-       if (readw(ofsAddr + FuncCode) != 0 && printk_ratelimit())
-               printk(KERN_WARNING "moxa function expired\n");
+       if (readw(ofsAddr + FuncCode) != 0)
+               printk_ratelimited(KERN_WARNING "moxa function expired\n");
 }
 
 static void moxafunc(void __iomem *ofsAddr, u16 cmd, u16 arg)