linux.git/drivers/staging/comedi, branch v5.11

Staging: comedi: Return -EFAULT if copy_to_user() fails

2020-12-28T14:14:53+00:00

Return -EFAULT on error instead of the number of bytes remaining to be
copied.

Fixes: bac42fb21259 ("comedi: get rid of compat_alloc_user_space() mess in COMEDI_CMD{,TEST} compat")
Signed-off-by: Dan Carpenter 
Cc: stable 
Link: https://lore.kernel.org/r/X8c3pfwFy2jpy4BP@mwanda
Signed-off-by: Greg Kroah-Hartman

staging: comedi: mf6x4: Fix AI end-of-conversion detection

2020-12-09T14:49:13+00:00

I have had reports from two different people that attempts to read the
analog input channels of the MF624 board fail with an `ETIMEDOUT` error.

After triggering the conversion, the code calls `comedi_timeout()` with
`mf6x4_ai_eoc()` as the callback function to check if the conversion is
complete.  The callback returns 0 if complete or `-EBUSY` if not yet
complete.  `comedi_timeout()` returns `-ETIMEDOUT` if it has not
completed within a timeout period which is propagated as an error to the
user application.

The existing code considers the conversion to be complete when the EOLC
bit is high.  However, according to the user manuals for the MF624 and
MF634 boards, this test is incorrect because EOLC is an active low
signal that goes high when the conversion is triggered, and goes low
when the conversion is complete.  Fix the problem by inverting the test
of the EOLC bit state.

Fixes: 04b565021a83 ("comedi: Humusoft MF634 and MF624 DAQ cards driver")
Cc:  # v4.4+
Cc: Rostislav Lisovy 
Signed-off-by: Ian Abbott 
Link: https://lore.kernel.org/r/20201207145806.4046-1-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman

Merge 5.10-rc2 into staging-next

2020-11-02T09:03:12+00:00

We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman

staging: comedi: cb_pcidas: Allow 2-channel commands for AO subdevice

2020-10-27T12:19:01+00:00

The "cb_pcidas" driver supports asynchronous commands on the analog
output (AO) subdevice for those boards that have an AO FIFO.  The code
(in `cb_pcidas_ao_check_chanlist()` and `cb_pcidas_ao_cmd()`) to
validate and set up the command supports output to a single channel or
to two channels simultaneously (the boards have two AO channels).
However, the code in `cb_pcidas_auto_attach()` that initializes the
subdevices neglects to initialize the AO subdevice's `len_chanlist`
member, leaving it set to 0, but the Comedi core will "correct" it to 1
if the driver neglected to set it.  This limits commands to use a single
channel (either channel 0 or 1), but the limit should be two channels.
Set the AO subdevice's `len_chanlist` member to be the same value as the
`n_chan` member, which will be 2.

Cc: 
Signed-off-by: Ian Abbott 
Link: https://lore.kernel.org/r/20201021122142.81628-1-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman

staging: comedi: tests: Simplify conditional evaluation

2020-10-26T05:53:10+00:00

Boolean comparison of the condition inside unittest function is
unnecessary and can be simplified by directly using the condition
outcome for evaluation. Issue reported by :
scripts/coccinelle/misc/boolinit.cocci

Signed-off-by: Deepak R Varma 
Link: https://lore.kernel.org/r/20201019171426.GA72818@ubuntu204
Signed-off-by: Greg Kroah-Hartman

staging: comedi: ni_mio_common: Fix newline after dereference operator

2020-10-26T05:53:09+00:00

Fix newline after dereference operator detected by checkpatch.

Signed-off-by: Vasily Utkin 
Link: https://lore.kernel.org/r/20201010170721.98595-1-vautkin@teknik.io
Signed-off-by: Greg Kroah-Hartman

staging: comedi: check validity of wMaxPacketSize of usb endpoints found

2020-10-10T10:37:46+00:00

While finding usb endpoints in vmk80xx_find_usb_endpoints(), check if
wMaxPacketSize = 0 for the endpoints found.

Some devices have isochronous endpoints that have wMaxPacketSize = 0
(as required by the USB-2 spec).
However, since this doesn't apply here, wMaxPacketSize = 0 can be
considered to be invalid.

Reported-by: syzbot+009f546aa1370056b1c2@syzkaller.appspotmail.com
Tested-by: syzbot+009f546aa1370056b1c2@syzkaller.appspotmail.com
Signed-off-by: Anant Thazhemadam 
Cc: stable 
Link: https://lore.kernel.org/r/20201010082933.5417-1-anant.thazhemadam@gmail.com
Signed-off-by: Greg Kroah-Hartman

drivers: staging: comedi: fixed duplicate words from checkpatch

2020-08-28T10:19:16+00:00

Fixed various different checkpatch duplicate word warnings, the TODO
file said to fix checkpatch warnings.

Signed-off-by: Ethan Edwards 
Link: https://lore.kernel.org/r/20200825002955.e3wvtwsoqqbc2cvl@archlaptop.localdomain
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: pcl726: fixed a spelling mistake

2020-08-18T14:07:17+00:00

Fixed a spelling mistake issue

Signed-off-by: Lokesh Chebrolu 
Link: https://lore.kernel.org/r/1596784806-7130-1-git-send-email-lokeshch007@gmail.com
Signed-off-by: Greg Kroah-Hartman

staging: comedi: s526: Use fallthrough pseudo-keyword

2020-07-28T08:18:52+00:00

Replace the existing /* fall through */ comments and its variants with
the new pseudo-keyword macro fallthrough[1].

[1] https://www.kernel.org/doc/html/v5.7/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through

Signed-off-by: Gustavo A. R. Silva 
Link: https://lore.kernel.org/r/20200727184247.GA29207@embeddedor
Signed-off-by: Greg Kroah-Hartman