From: Ian Abbott Date: Wed, 3 Sep 2014 12:45:30 +0000 (+0100) Subject: staging: comedi: use CMDF_WAKE_EOS in do_cmd_ioctl() X-Git-Tag: firefly_0821_release~176^2~3121^2~739 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d8bff6e35e87ca5d8cd348d2563b34afb4faf28b;p=firefly-linux-kernel-4.4.55.git staging: comedi: use CMDF_WAKE_EOS in do_cmd_ioctl() `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 Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 2182c7463cdb..9d60a39ac961 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -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);