projects
/
comedi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4d052d4
)
ni_pcidio: Forgot to include irq flags variable for spinlock.
author
Ian Abbott
<abbotti@mev.co.uk>
Mon, 18 Jul 2011 11:16:18 +0000
(12:16 +0100)
committer
Ian Abbott
<abbotti@mev.co.uk>
Mon, 18 Jul 2011 11:16:18 +0000
(12:16 +0100)
I messed up the previous commit. Need to include a variable in
setup_mite_dma() to hold the IRQ flags when grabbing the spinlock.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
comedi/drivers/ni_pcidio.c
patch
|
blob
|
history
diff --git
a/comedi/drivers/ni_pcidio.c
b/comedi/drivers/ni_pcidio.c
index 1e66cd4393479da2ba4c4238b8b33cd17ba3e75a..69727789ab3ad747a0c025615ea2da3c8c0ff6a2 100644
(file)
--- a/
comedi/drivers/ni_pcidio.c
+++ b/
comedi/drivers/ni_pcidio.c
@@
-990,6
+990,7
@@
static int ni_pcidio_cmd(comedi_device * dev, comedi_subdevice * s)
static int setup_mite_dma(comedi_device * dev, comedi_subdevice * s)
{
int retval;
+ unsigned long flags;
retval = ni_pcidio_request_di_mite_channel(dev);
if (retval)