Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0cd2da1 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_watchdog: all i/o registers are 32-bit 



All the i/o registers used by the watchdog device on the addi-data
boards are 32-bit. Make sure all the i/o commands use outl/inl to
access the registers.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1445ea15

drivers/staging/comedi/drivers/addi_watchdog.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ static int addi_watchdog_insn_config(struct comedi_device *dev, 
	case INSN_CONFIG_ARM:

	case INSN_CONFIG_ARM:

		spriv->wdog_ctrl = ADDI_WDOG_CTRL_ENABLE;

		spriv->wdog_ctrl = ADDI_WDOG_CTRL_ENABLE;

		reload = data[1] & s->maxdata;

		reload = data[1] & s->maxdata;

		outw(reload, spriv->iobase + ADDI_WDOG_RELOAD_REG);

		outl(reload, spriv->iobase + ADDI_WDOG_RELOAD_REG);





		/* Time base is 20ms, let the user know the timeout */

		/* Time base is 20ms, let the user know the timeout */

		dev_info(dev->class_dev, "watchdog enabled, timeout:%dms\n",

		dev_info(dev->class_dev, "watchdog enabled, timeout:%dms\n",
@@ -78,7 +78,7 @@ static int addi_watchdog_insn_config(struct comedi_device *dev, 
		return -EINVAL;

		return -EINVAL;

	}

	}





	outw(spriv->wdog_ctrl, spriv->iobase + ADDI_WDOG_CTRL_REG);

	outl(spriv->wdog_ctrl, spriv->iobase + ADDI_WDOG_CTRL_REG);





	return insn->n;

	return insn->n;

}

}
@@ -112,7 +112,7 @@ static int addi_watchdog_insn_write(struct comedi_device *dev, 




	/* "ping" the watchdog */

	/* "ping" the watchdog */

	for (i = 0; i < insn->n; i++) {

	for (i = 0; i < insn->n; i++) {

		outw(spriv->wdog_ctrl | ADDI_WDOG_CTRL_SW_TRIG,

		outl(spriv->wdog_ctrl | ADDI_WDOG_CTRL_SW_TRIG,

		     spriv->iobase + ADDI_WDOG_CTRL_REG);

		     spriv->iobase + ADDI_WDOG_CTRL_REG);

	}

	}