Skip to content

Z
ZIO
Commit 9cc6e72d authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

trigger: [FIX] on abort return old flags 

Currently the trigger abort function returns only the previous value
of the status flag, but actually we had always used it as if it was
the entire flag, and this can break "self timed" applications on
trigger configuration.
Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 8b355ef9
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
helpers.c
View file @ 9cc6e72d
......@@ -34,8 +34,8 @@ static void __zio_internal_abort_free(struct zio_cset *cset)
* This is a ZIO helper to invoke the abort function. This must be used when
* something is going wrong during the acquisition or an armed trigger
* must be modified. If so requested, the trigger is disabled too.
* The function returns the previous value of the disabled flags,
* or -EAGAIN if it cannot disable because of hardware-busy status.
* The function returns the previous flags value, or -EAGAIN if it cannot
* disable because of hardware-busy status.
*/
int __zio_trigger_abort_disable(struct zio_cset *cset, int disable)
{
......@@ -51,6 +51,8 @@ int __zio_trigger_abort_disable(struct zio_cset *cset, int disable)
return -EAGAIN;
}
/* Save previous flags status */
ret = ti->flags;
/*
* If the trigger is running (ZIO_TI_ARMED), then abort it.
* Since the whole data_done procedure happens in locked context,
......@@ -65,7 +67,6 @@ int __zio_trigger_abort_disable(struct zio_cset *cset, int disable)
__zio_internal_abort_free(cset);
ti->flags &= (~ZIO_TI_ARMED);
}
ret = ti->flags & ZIO_STATUS;
if (disable)
ti->flags |= ZIO_DISABLED;
spin_unlock_irqrestore(&cset->lock, flags);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment