Merge tag 'media/v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[cascardo/linux.git] / drivers / staging / media / lirc / lirc_parallel.c

diff --git a/drivers/staging/media/lirc/lirc_parallel.c b/drivers/staging/media/lirc/lirc_parallel.c
index 878fdea..bfb76a4 100644 (file)
--- a/drivers/staging/media/lirc/lirc_parallel.c
+++ b/drivers/staging/media/lirc/lirc_parallel.c
@@ -163,12 +163,12 @@ static unsigned int init_lirc_timer(void)
        if (count >= 1000 && timeelapsed > 0) {
                if (default_timer == 0) {
                        /* autodetect timer */
-                       newtimer = (1000000*count)/timeelapsed;
+                       newtimer = (1000000 * count) / timeelapsed;
                        pr_info("%u Hz timer detected\n", newtimer);
                        return newtimer;
                }
-               newtimer = (1000000*count)/timeelapsed;
-               if (abs(newtimer - default_timer) > default_timer/10) {
+               newtimer = (1000000 * count) / timeelapsed;
+               if (abs(newtimer - default_timer) > default_timer / 10) {
                        /* bad timer */
                        pr_notice("bad timer: %u Hz\n", newtimer);
                        pr_notice("using default timer: %u Hz\n",