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

Commit 3cd73bc1 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_mio_common: always lock in ni_ai_poll() 



`ni_ai_poll()` currently acquires (and later releases) the comedi
device's spin-lock iff `in_interrupt()` returns 0.  However, it is only
called during processing of a `COMEDI_POLL` ioctl so `in_interrupt()`
will always return 0 in this case.  Remove this test and acquire/release
the spin-lock unconditionally.  This eliminates a sparse warning about
different lock contexts for basic block.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent affdc230

drivers/staging/comedi/drivers/ni_mio_common.c

+3 −5
Original line number Diff line number Diff line
@@ -1766,11 +1766,10 @@ static int ni_ai_reset(struct comedi_device *dev, struct comedi_subdevice *s) 


static int ni_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s)

{

	unsigned long flags = 0;

	unsigned long flags;

	int count;



	/*  lock to avoid race with interrupt handler */

	if (in_interrupt() == 0)

	spin_lock_irqsave(&dev->spinlock, flags);

#ifndef PCIDMA

	ni_handle_fifo_dregs(dev);
@@ -1778,7 +1777,6 @@ static int ni_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s) 
	ni_sync_ai_dma(dev);

#endif

	count = s->async->buf_write_count - s->async->buf_read_count;

	if (in_interrupt() == 0)

	spin_unlock_irqrestore(&dev->spinlock, flags);



	return count;