fa-zio-drv.c: handle zio_arm_trigger() failure

Do not start acquisition if the trigger is not armed Signed-off-by: Federico Vaga <federico.vaga@gmail.com>

fa-zio-drv.c: handle zio_arm_trigger() failure
Do not start acquisition if the trigger is not armed Signed-off-by: Federico Vaga <federico.vaga@gmail.com>
df92f628 · Federico Vaga · 57a1a012 · df92f628
Commit df92f628 authored Apr 05, 2013 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

fa-zio-drv.c kernel/fa-zio-drv.c +13 -0

No files found.
--- a/kernel/fa-zio-drv.c
+++ b/kernel/fa-zio-drv.c
@@ -297,6 +297,18 @@ int zfad_fsm_command(struct fa_dev *fa, uint32_t command)

 		/* Now we can arm the trigger for the incoming acquisition */
 		zio_arm_trigger(fa->zdev->cset->ti);
+		/*
+		 *  FIXME maybe zio_arm_trigger() can return an error when it
+		 * is not able to arm a trigger.
+		 *
+		 * It returns -EPERM, but the error can be -ENOMEM or -EINVAL
+		 * from zfat_arm_trigger() or zfad_input_cset()
+		 */
+		if (!(fa->zdev->cset->ti->flags & ZIO_TI_ARMED)) {
+			dev_err(fa->fmc->hwdev,
+				"Trigger not armed, cannot start acquisition\n");
+			return -EPERM;
+		}

 		dev_dbg(fa->fmc->hwdev, "FSM START Command, Enable interrupts\n");
 		zfa_common_conf_set(fa, ZFA_IRQ_MASK, ZFAT_ALL);
@@ -607,6 +619,7 @@ static int zfad_input_cset(struct zio_cset *cset)
 {
 	struct fa_dev *fa = cset->zdev->priv_d;

+	dev_dbg(fa->fmc->hwdev, "Ready to acquire\n");
 	/* ZIO should configure only the interleaved channel */
 	if (!cset->interleave)
 		return -EINVAL;