linux-stable.git/drivers/staging/comedi, branch v4.9.2

staging: comedi: ni_mio_common: fix E series ni_ai_insn_read() data

2017-01-09T07:32:18+00:00

commit 857a661020a2de3a0304edf33ad656abee100891 upstream.

Commit 0557344e2149 ("staging: comedi: ni_mio_common: fix local var for
32-bit read") changed the type of local variable `d` from `unsigned
short` to `unsigned int` to fix a bug introduced in
commit 9c340ac934db ("staging: comedi: ni_stc.h: add read/write
callbacks to struct ni_private") when reading AI data for NI PCI-6110
and PCI-6111 cards.  Unfortunately, other parts of the function rely on
the variable being `unsigned short` when an offset value in local
variable `signbits` is added to `d` before writing the value to the
`data` array:

			d += signbits;
		  	data[n] = d;

The `signbits` variable will be non-zero in bipolar mode, and is used to
convert the hardware's 2's complement, 16-bit numbers to Comedi's
straight binary sample format (with 0 representing the most negative
voltage).  This breaks because `d` is now 32 bits wide instead of 16
bits wide, so after the addition of `signbits`, `data[n]` ends up being
set to values above 65536 for negative voltages.  This affects all
supported "E series" cards except PCI-6143 (and PXI-6143). Fix it by
ANDing the value written to the `data[n]` with the mask 0xffff.

Fixes: 0557344e2149 ("staging: comedi: ni_mio_common: fix local var for 32-bit read")
Signed-off-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: ni_mio_common: fix M Series ni_ai_insn_read() data mask

2017-01-09T07:32:18+00:00

commit 655c4d442d1213b617926cc6d54e2a9a793fb46b upstream.

For NI M Series cards, the Comedi `insn_read` handler for the AI
subdevice is broken due to ANDing the value read from the AI FIFO data
register with an incorrect mask.  The incorrect mask clears all but the
most significant bit of the sample data.  It should preserve all the
sample data bits.  Correct it.

Fixes: 817144ae7fda ("staging: comedi: ni_mio_common: remove unnecessary use of 'board->adbits'")
Signed-off-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: ni_tio: fix buggy ni_tio_clock_period_ps() return value

2016-11-07T10:45:42+00:00

`ni_tio_clock_period_ps()` used to return the clock period in
picoseconds, and had a `BUG()` call for invalid cases.  It was changed
to pass the clock period back via a pointer parameter and return an
error for the invalid cases.  Unfortunately the code to handle
user-specified clock sources with user-specified clock period is still
returning the clock period the old way, which can lead to the caller not
getting the clock period, or seeing an unexpected error.  Fix it by
passing the clock period via the pointer parameter and returning `0`.

Fixes: b42ca86ad605 ("staging: comedi: ni_tio: remove BUG() checks for ni_tio_get_clock_src()")
Signed-off-by: Ian Abbott 
Cc:  # 4.7+
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: Align the * in block comments

2016-10-02T15:29:11+00:00

Align the * on each line of block comments as reported by checkpatch

Signed-off-by: Ramiro Oliveira 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: Use vma_pages function on vma object instead of explicit computation

2016-09-20T12:01:21+00:00

This patch uses vma_pages function on vma object instead of explicit
computation.

Signed-off-by: sayli karnik 
Reviewed-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: Use the BIT() macro instead of left shifting 1

2016-09-16T08:27:52+00:00

This patch replaces left shifts on 1 with the BIT(x) macro, as suggested
by checkpatch.pl.

Signed-off-by: sayli karnik 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: s626: Remove all unused functions

2016-09-16T08:27:52+00:00

Remove all #ifdef'ed static functions as they are not used anywhere
in the kernel. Some functions were detected using Coccinelle but removed by
hand and some were removed as the functions in which they were getting
used were also unused functions.
Script:

@initialize:python@
@@
def display(name,p):
        print(name,p[0].file)

@r1@
identifier func;
type T;
position p;
@@
static T func@p(...)
{
...
}

@r@
identifier r1.func;
@@
func

@script:python depends on !r@
func << r1.func;
p << r1.p;
@@
display(func,p)

Signed-off-by: Bhumika Goyal 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: drivers: Delete NULL check before pci_dev_put

2016-09-13T12:51:53+00:00

The function pci_dev_put checks whether its argument is NULL and returns
immediately. Therefore, NULL test before the call if not needed.
Found using coccinelle:
@@
expression x;
@@

- if(x)
- pci_dev_put(x);
+ pci_dev_put(x);

Signed-off-by: Bhumika Goyal 
Reviewed-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: comedi_fops: coding style fixes

2016-09-13T12:51:53+00:00

- Fixed coding style in comedi_fops.c Symbolic to octal permission.

Signed-off-by: Matias Mucciolo 
Reviewed-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

Merge 4.8-rc5 into staging-next

2016-09-05T06:13:24+00:00

We want the staging fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman