From ff50236e50bb47f45484685c4c9e1b1b32fcffc6 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sun, 13 Jan 2013 23:05:05 +0300 Subject: [PATCH] --- yaml --- r: 354006 b: refs/heads/master c: 8841d798f42430133a7874430ac634347b31fce5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_tiocmd.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 41ecae3c2d67..a2c1adbce03e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6903098c169026f134455f4c41dd834f085e842d +refs/heads/master: 8841d798f42430133a7874430ac634347b31fce5 diff --git a/trunk/drivers/staging/comedi/drivers/ni_tiocmd.c b/trunk/drivers/staging/comedi/drivers/ni_tiocmd.c index 0c991b99da13..13747f324936 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_tiocmd.c +++ b/trunk/drivers/staging/comedi/drivers/ni_tiocmd.c @@ -159,6 +159,7 @@ static int ni_tio_input_cmd(struct ni_gpct *counter, struct comedi_async *async) async->inttrig = NULL; mite_dma_arm(counter->mite_chan); retval = ni_tio_arm(counter, 1, cmd->start_arg); + break; case TRIG_OTHER: async->inttrig = NULL; mite_dma_arm(counter->mite_chan);