vserver 1.9.5.x5

[linux-2.6.git] / drivers / s390 / char / con3270.c

diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
index 11c1b3b..d52fb57 100644 (file)
--- a/drivers/s390/char/con3270.c
+++ b/drivers/s390/char/con3270.c
@@ -77,10 +77,9 @@ con3270_set_timer(struct con3270 *cp, int expires)
                        del_timer(&cp->timer);
                return;
        }
-       if (timer_pending(&cp->timer)) {
-               if (mod_timer(&cp->timer, jiffies + expires))
-                       return;
-       }
+       if (timer_pending(&cp->timer) &&
+           mod_timer(&cp->timer, jiffies + expires))
+               return;
        cp->timer.function = (void (*)(unsigned long)) con3270_update;
        cp->timer.data = (unsigned long) cp;
        cp->timer.expires = jiffies + expires;