tty: early return from send_break() on TTY_DRIVER_HARDWARE_BREAK

[linux-2.6-block.git] / drivers / tty / tty_io.c

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 2ed12ca7c8327ea1543955b6dcaad1b8f47151d9..87bb5094e0bb8ea05e32ce4a8c8e8cbd136e5468 100644 (file)
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -2475,22 +2475,24 @@ static int send_break(struct tty_struct *tty, unsigned int duration)
                return 0;
 
        if (tty->driver->flags & TTY_DRIVER_HARDWARE_BREAK)
-               retval = tty->ops->break_ctl(tty, duration);
-       else {
-               /* Do the work ourselves */
-               if (tty_write_lock(tty, false) < 0)
-                       return -EINTR;
-               retval = tty->ops->break_ctl(tty, -1);
-               if (retval)
-                       goto out;
-               if (!signal_pending(current))
-                       msleep_interruptible(duration);
-               retval = tty->ops->break_ctl(tty, 0);
+               return tty->ops->break_ctl(tty, duration);
+
+       /* Do the work ourselves */
+       if (tty_write_lock(tty, false) < 0)
+               return -EINTR;
+
+       retval = tty->ops->break_ctl(tty, -1);
+       if (retval)
+               goto out;
+       if (!signal_pending(current))
+               msleep_interruptible(duration);
+       retval = tty->ops->break_ctl(tty, 0);
 out:
-               tty_write_unlock(tty);
-               if (signal_pending(current))
-                       retval = -EINTR;
-       }
+       tty_write_unlock(tty);
+
+       if (signal_pending(current))
+               retval = -EINTR;
+
        return retval;
 }