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

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

staging: comedi: das16: remove unnecessary test in das16_interrupt() 



The timer is only started by the ai subdevice in das16_cmd_exec()
and this function can only be called if the device is attached.

Remove the unnecessary sanity check.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 372f3bb9

drivers/staging/comedi/drivers/das16.c

+4 −11
Original line number Diff line number Diff line
@@ -350,21 +350,14 @@ static int disable_dma_on_even(struct comedi_device *dev) 
static void das16_interrupt(struct comedi_device *dev)

{

	struct das16_private_struct *devpriv = dev->private;

	unsigned long dma_flags, spin_flags;

	struct comedi_subdevice *s = dev->read_subdev;

	struct comedi_async *async;

	struct comedi_cmd *cmd;

	struct comedi_async *async = s->async;

	struct comedi_cmd *cmd = &async->cmd;

	unsigned long spin_flags;

	unsigned long dma_flags;

	int num_bytes, residue;

	int buffer_index;



	if (!dev->attached) {

		comedi_error(dev, "premature interrupt");

		return;

	}

	/*  initialize async here to make sure it is not NULL */

	async = s->async;

	cmd = &async->cmd;



	spin_lock_irqsave(&dev->spinlock, spin_flags);

	if ((devpriv->ctrl_reg & DMA_ENABLE) == 0) {

		spin_unlock_irqrestore(&dev->spinlock, spin_flags);