Commit bc04bec0 authored by Masanari Iida's avatar Masanari Iida Committed by Greg Kroah-Hartman

staging: comedi: Fix typo in comedi

Correct spelling typo in comments within staging/comedi.
Signed-off-by: default avatarMasanari Iida <standby24x7@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8b7d417c
...@@ -299,7 +299,7 @@ struct pci9118_private { ...@@ -299,7 +299,7 @@ struct pci9118_private {
short *ai_data; short *ai_data;
short ao_data[2]; /* data output buffer */ short ao_data[2]; /* data output buffer */
unsigned int ai_scans; /* number of scans to do */ unsigned int ai_scans; /* number of scans to do */
char dma_doublebuf; /* we can use double buffring */ char dma_doublebuf; /* we can use double buffering */
unsigned int dma_actbuf; /* which buffer is used now */ unsigned int dma_actbuf; /* which buffer is used now */
short *dmabuf_virt[2]; /* short *dmabuf_virt[2]; /*
* pointers to begin of * pointers to begin of
......
...@@ -57,8 +57,8 @@ range and aref. ...@@ -57,8 +57,8 @@ range and aref.
AI Triggering: AI Triggering:
For start_src == TRIG_EXT, the A/D EXTERNAL TRIGGER IN (pin 45) is used. For start_src == TRIG_EXT, the A/D EXTERNAL TRIGGER IN (pin 45) is used.
For 1602 series, the start_arg is interpreted as follows: For 1602 series, the start_arg is interpreted as follows:
start_arg == 0 => gated triger (level high) start_arg == 0 => gated trigger (level high)
start_arg == CR_INVERT => gated triger (level low) start_arg == CR_INVERT => gated trigger (level low)
start_arg == CR_EDGE => Rising edge start_arg == CR_EDGE => Rising edge
start_arg == CR_EDGE | CR_INVERT => Falling edge start_arg == CR_EDGE | CR_INVERT => Falling edge
For the other boards the trigger will be done on rising edge For the other boards the trigger will be done on rising edge
......
...@@ -450,7 +450,7 @@ static irqreturn_t das800_interrupt(int irq, void *d) ...@@ -450,7 +450,7 @@ static irqreturn_t das800_interrupt(int irq, void *d)
/* otherwise, stop taking data */ /* otherwise, stop taking data */
} else { } else {
spin_unlock_irqrestore(&dev->spinlock, irq_flags); spin_unlock_irqrestore(&dev->spinlock, irq_flags);
disable_das800(dev); /* diable hardware triggered conversions */ disable_das800(dev); /* disable hardware triggered conversions */
async->events |= COMEDI_CB_EOA; async->events |= COMEDI_CB_EOA;
} }
comedi_event(dev, s); comedi_event(dev, s);
......
...@@ -141,7 +141,7 @@ static int dyna_pci10xx_insn_read_ai(struct comedi_device *dev, ...@@ -141,7 +141,7 @@ static int dyna_pci10xx_insn_read_ai(struct comedi_device *dev,
for (counter = 0; counter < READ_TIMEOUT; counter++) { for (counter = 0; counter < READ_TIMEOUT; counter++) {
d = inw_p(devpriv->BADR2); d = inw_p(devpriv->BADR2);
/* check if read is successfull if the EOC bit is set */ /* check if read is successful if the EOC bit is set */
if (d & (1 << 15)) if (d & (1 << 15))
goto conv_finish; goto conv_finish;
} }
......
...@@ -631,7 +631,7 @@ static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -631,7 +631,7 @@ static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it)
printk(KERN_WARNING " irq %u\n", dev->irq); printk(KERN_WARNING " irq %u\n", dev->irq);
/* alocate pci dma buffers */ /* allocate pci dma buffers */
for (i = 0; i < NUM_DMA_BUFFERS; i++) { for (i = 0; i < NUM_DMA_BUFFERS; i++) {
priv(dev)->dio_buffer[i] = priv(dev)->dio_buffer[i] =
pci_alloc_consistent(priv(dev)->hw_dev, DMA_BUFFER_SIZE, pci_alloc_consistent(priv(dev)->hw_dev, DMA_BUFFER_SIZE,
......
...@@ -835,7 +835,7 @@ static int icp_multi_attach(struct comedi_device *dev, ...@@ -835,7 +835,7 @@ static int icp_multi_attach(struct comedi_device *dev,
printk(KERN_WARNING printk(KERN_WARNING
"icp_multi EDBG: BGN: icp_multi_attach(...)\n"); "icp_multi EDBG: BGN: icp_multi_attach(...)\n");
/* Alocate private data storage space */ /* Allocate private data storage space */
ret = alloc_private(dev, sizeof(struct icp_multi_private)); ret = alloc_private(dev, sizeof(struct icp_multi_private));
if (ret < 0) if (ret < 0)
return ret; return ret;
......
...@@ -1358,7 +1358,7 @@ static int usbdux_ai_insn_read(struct comedi_device *dev, ...@@ -1358,7 +1358,7 @@ static int usbdux_ai_insn_read(struct comedi_device *dev,
/* 32 bits big endian from the A/D converter */ /* 32 bits big endian from the A/D converter */
one = be32_to_cpu(*((int32_t *) one = be32_to_cpu(*((int32_t *)
((this_usbduxsub->insnBuffer)+1))); ((this_usbduxsub->insnBuffer)+1)));
/* mask out the staus byte */ /* mask out the status byte */
one = one & 0x00ffffff; one = one & 0x00ffffff;
/* turn it into an unsigned integer */ /* turn it into an unsigned integer */
one = one ^ 0x00800000; one = one ^ 0x00800000;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment