kernel/linux.git/drivers/staging/comedi, branch v4.17.1

staging: comedi: s626: Use Preferred kernel type

2018-03-29T09:53:27+00:00

Change to kenel type u8 or u16 instead of uint8_t or uint16_t Signed-off-by: Paul McQuade Signed-off-by: Greg Kroah-Hartman

Staging: comedi: fix multiple line dereference coding style issue in cb_pcidas64.c

2018-03-23T14:55:21+00:00

This is a patch to the cb_pcidas64.c file that fixes up a multiple line dereference warning found by the checkpatch.pl tool. Signed-off-by: Jian Zhang Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman

staging: comedi: cb_pcidas64: Fix external_ai_queue_in_use()

2018-03-23T14:55:21+00:00

`external_ai_queue_in_use()` is supposed to return 1 if the external channel sequencer is in use by an AI command, else return 0. If the "read" subdevice (which is the AI subdevice) is not busy then no AI command is running so the external channel sequencer is not in use, so the function should return 0. Unfortunately, the function's "read" subdevice busy test is inverted, so the function always returns 0 when the "read" subdevice is busy. Worse, if the "read" subdevice is not busy the subsequent call to `use_internal_queue_6xxx()` results in a null pointer dereference if a previous AI command used a channel list with a length greater than 1. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman

Revert "staging: comedi: cb_pcidas64: change params to external_ai_queue_in_use()"

2018-03-23T14:55:21+00:00

This reverts commit f5f3a2c6569e ("staging: comedi: cb_pcidas64: change params to external_ai_queue_in_use()"). The `external_ai_queue_in_use()` was being called from `ao_cmd()` with pointers to the "write" subdevice and AO command, but is supposed to check whether the external AI queue is currently in use by the "read" subdevice and AI command. In fact, the return value always indicated that the external AI queue was not in use in this case (because the AO command's channel list is sequential), so was fairly useless. (However, even before the reverted commit, the logic in `external_ai_queue_in_use()` was wrong. That will be corrected in a subsequent commit.) Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman

staging: comedi: ni_mio_common: ack ai fifo error interrupts.

2018-03-19T18:43:24+00:00

Ack ai fifo error interrupts in interrupt handler to clear interrupt after fifo overflow. It should prevent lock-ups after the ai fifo overflows. Cc: # v4.2+ Signed-off-by: Frank Mori Hess Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman

Staging: comedi: drivers: ni_atmio.c: fixed multi-line derefernce issue

2018-03-19T18:43:24+00:00

Fixed coding style issue. Signed-off-by: Pratik Jain Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman

Merge 4.16-rc6 into staging-next

2018-03-19T05:47:01+00:00

We want the staging fixes in here as well to handle merge/test issues. Signed-off-by: Greg Kroah-Hartman

staging: comedi: adl_pci6208: remove redundant initialization of 'val'

2018-03-14T11:57:06+00:00

Variable 'val' is initialized with a value that is never read, it is updated with a new value again after intitialization. Remove the redundant initialization and move the declaration and assignment into the scope of the for-loop. Cleans up clang warning: drivers/staging/comedi/drivers/adl_pci6208.c:61:15: warning: Value stored to 'val' during its initialization is never read Signed-off-by: Colin Ian King Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman

staging: comedi: fix comedi_nsamples_left.

2018-03-06T15:21:10+00:00

A rounding error was causing comedi_nsamples_left to return the wrong value when nsamples was not a multiple of the scan length. Cc: # v4.4+ Signed-off-by: Frank Mori Hess Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman

staging: comedi: Replace "dont" with "don't

2018-03-06T12:01:10+00:00

Replace "dont" with "don't". "Dont" is not same as "Do not" or "Don't". Signed-off-by: Arushi Singhal Acked-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman