]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: use CMDF_WAKE_EOS in do_cmd_ioctl()
authorIan Abbott <abbotti@mev.co.uk>
Wed, 3 Sep 2014 12:45:30 +0000 (13:45 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Sep 2014 20:50:13 +0000 (13:50 -0700)
`TRIG_WAKE_EOS` is now just a synonym for `CMDF_WAKE_EOS`.  Change
`do_cmd_ioctl()` to use the new name.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/comedi_fops.c

index 2182c7463cdbdaa8bc0dbc5a38770d7f2ca67998..9d60a39ac9618fa03a853fda635bd82af4b63fe7 100644 (file)
@@ -1558,7 +1558,7 @@ static int do_cmd_ioctl(struct comedi_device *dev,
        async->cb_mask =
            COMEDI_CB_EOA | COMEDI_CB_BLOCK | COMEDI_CB_ERROR |
            COMEDI_CB_OVERFLOW;
-       if (async->cmd.flags & TRIG_WAKE_EOS)
+       if (async->cmd.flags & CMDF_WAKE_EOS)
                async->cb_mask |= COMEDI_CB_EOS;
 
        comedi_set_subdevice_runflags(s, SRF_ERROR | SRF_RUNNING, SRF_RUNNING);