Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
index ee1dde52e8fc..3352b2443e58 100644
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
@@ -167,7 +167,7 @@ static int irtty_set_dtr_rts(struct sir_dev *dev, int dtr, int rts)
          * let's be careful... Jean II
          */
         IRDA_ASSERT(priv->tty->ops->tiocmset != NULL, return -1;);
-        priv->tty->ops->tiocmset(priv->tty, NULL, set, clear);
+        priv->tty->ops->tiocmset(priv->tty, set, clear);
 
         return 0;
 }