pm24.git/drivers/staging/comedi, branch v3.9

staging: comedi: s626: fix continuous acquisition

2013-03-25T18:35:38Z

For the s626 driver, there is a bug in the handling of asynchronous commands on the AI subdevice when the stop source is `TRIG_NONE`. The command should run continuously until cancelled, but the interrupt handler stops the command running after the first scan. The command set-up function `s626_ai_cmd()` contains this code: switch (cmd->stop_src) { case TRIG_COUNT: /* data arrives as one packet */ devpriv->ai_sample_count = cmd->stop_arg; devpriv->ai_continous = 0; break; case TRIG_NONE: /* continous acquisition */ devpriv->ai_continous = 1; devpriv->ai_sample_count = 0; break; } The interrupt handler `s626_irq_handler()` contains this code: if (!(devpriv->ai_continous)) devpriv->ai_sample_count--; if (devpriv->ai_sample_count <= 0) { devpriv->ai_cmd_running = 0; /* ... */ } So `devpriv->ai_sample_count` is only decremented for the `TRIG_COUNT` case, but `devpriv->ai_cmd_running` is set to 0 (and the command stopped) regardless. Fix this in `s626_ai_cmd()` by setting `devpriv->ai_sample_count = 1` for the `TRIG_NONE` case. The interrupt handler will not decrement it so it will remain greater than 0 and the check for stopping the acquisition will fail. Cc: stable Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman

staging: comedi: dt9812: use CR_CHAN() for channel number

2013-03-11T17:21:05Z

As pointed out by Dan Carpenper in , the dt9812 comedi driver's use of the `chanspec` member of `struct comedi_insn` as a channel number is incorrect. Change it to use `CR_CHAN(insn->chanspec)` as the channel number (where `insn` is a pointer to the `struct comedi_insn` being processed). Reported-by: Dan Carpenter Cc: stable # 3.8 onwards Cc: Anders Blomdell Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman

staging: comedi: drivers: usbduxsigma.c: fix DMA buffers on stack

2013-03-11T16:38:37Z

This patch fixes an instance of DMA buffer on stack(being passed to usb_control_msg)for the USB-DUXsigma Board driver. Found using smatch. Signed-off-by: Kumar Amit Mehta Reviewed-by: Dan Carpenter Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman

staging: comedi: drivers: usbduxfast.c: fix for DMA buffers on stack

2013-03-11T16:30:04Z

fix for instances of DMA buffer on stack(being passed to usb_control_msg) for the USB-DUXfast Board driver. Signed-off-by: Kumar Amit Mehta Signed-off-by: Greg Kroah-Hartman

staging: comedi: drivers: usbdux.c: fix DMA buffers on stack

2013-03-11T16:30:04Z

fix for instances of DMA buffer on stack(being passed to usb_control_msg) for the USB-DUX-D Board driver. Signed-off-by: Kumar Amit Mehta Signed-off-by: Greg Kroah-Hartman

more file_inode() open-coded instances

2013-02-27T21:59:05Z

Signed-off-by: Al Viro

staging: comedi: vmk80xx: wait for URBs to complete

2013-02-18T18:53:50Z

For Velleman K8055 (aka VM110), `vmk80xx_read_packet()` and `vmk8055_write_packet()` send an URB asynchronously and do not wait for it complete. However, callers of `vmk80xx_read_packet()` are assuming the contents of the data buffer `devpriv->usb_rx_buf` are valid immediately after that function returns. For Velleman K8061 (aka VM140), `vmk80xx_read_packet()` and `vmk80xx_write_packet()` punt the requests to `vmk80xx_do_bulk_msg()` which *does* wait for the URBs to complete (albeit with no error checking!). Change `vmk80xx_read_packet()` and `vmk80xx_write_packet()` to use `usb_interrupt_msg()` for the K8055, so the callers of `vmk80xx_read_packet()` can assume the data buffer contents are valid (if no error occurred). Remove all the code for checking for transfers in progress and busy waiting, as it's no longer needed. Pretty much all the callers of `vmk80xx_read_packet()` and `vmk80xx_write_packet()` hold the same semaphore anyway, and the only caller that doesn't (`vmk80xx_reset_device()` called during initialization of the device) doesn't really matter. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman

staging: comedi: drivers: addi-data: hwdrv_apci3200.c: Add a missing semicolon

2013-02-18T18:53:50Z

fix for missing end-of-statement by adding a semicolon Signed-off-by: Kumar Amit Mehta Signed-off-by: Greg Kroah-Hartman

staging/comedi: Remove if(); statement without effect

2013-02-15T18:20:14Z

Smatch warns about: staging/comedi/drivers/cb_pcidas64.c:3304 prep_ao_dma() warn: if(); So the check currently does nothing and can be removed, as indicated by Ian. Signed-off-by: Peter Huewe Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman

staging/comedi: Use && instead of & for logical comparision

2013-02-15T18:20:14Z

sparse complains that: drivers/staging/comedi/drivers/adl_pci9118.c:813 pci9118_calc_divisors() warn: maybe use && instead of & usessh is used as a boolean flag (0 and 1) and is compared to a boolean value so we should use && here. Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman