linux.git/drivers/staging/comedi, branch v2.6.35-rc4

Staging: comedi: fix read past end of array in cb_pcidda_attach()

2010-06-30T15:18:15+00:00

There are only 6 elements in the cb_pcidda_boards[] array so the
original code read past the end.  After this change nothing uses N_BOARDS
so I removed the definition.

Signed-off-by: Dan Carpenter 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: drivers: adl_pci9111: Fix AI commands in TRIG_FOLLOW case

2010-06-30T15:18:14+00:00

I received a report that AI streaming acquisitions do not work properly
for the adl_pci9111 driver when convert_src is TRIG_TIMER and
scan_begin_src is TRIG_FOLLOW (and scan_begin_arg is therefore 0).  This
seems to be down to the incorrect setting of dev_private->scan_delay in
pci9111_ai_do_cmd().  Under the previously stated conditions,
dev_private->scan_delay ends up set to (unsigned int)-1, but it ought to
be set to 0.  The function sets it to 0 initially, and it only makes
sense to change it if both convert_src and scan_begin_src are set to
TRIG_TIMER.

Note: 'scan_delay' is the number of unwanted scans to discard after each
valid scan.  The hardware does not support 'scan' timing as such, just a
regularly paced conversion timer (with automatic channel switching
between conversions).  The driver simulates a scan period that is some
(>1) multiple of the conversion period times the scan length
(chanlist_len samples) by reading chanlist_len samples and discarding
the next scan_delay times chanlist_len samples.

Signed-off-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

Staging: Eliminate a NULL pointer dereference

2010-06-04T20:38:57+00:00

Eliminate a NULL or near NULL pointer dereference.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// 
@r exists@
expression E,E1;
identifier f;
statement S1,S2,S3;
@@

if ((E == NULL && ...) || ...)
{
  ... when != if (...) S1 else S2
      when != E = E1
* E->f
  ... when any
  return ...;
}
else S3
// 

Signed-off-by: Julia Lawall 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi - correct parameter gainlkup for DAQCard-6024E in driver ni_mio_cs.c

2010-06-04T20:38:57+00:00

Correct at least one of the incorrect specs for a national instrument
data acquisition card DAQCard-6024E. This card has only four different
gain settings (+-10V, +-5V, +-0.5V, +-0.05V).

Signed-off-by: Martin Homuth-Rosemann 
Cc: stable 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: fixing ni_labpc to mite dependancy

2010-06-04T20:38:57+00:00

the dependancy of ni_labpc on mite was missing,

Signed-off-by: Alexander Kurz 
Acked-by: Randy Dunlap 
Signed-off-by: Greg Kroah-Hartman 

index 0aa2b0d..79f5f2e 100644

Staging: comedi: fixing ni_tio to mite PCI dependancy

2010-06-04T20:38:54+00:00

On Wed, 19 May 2010, Randy Dunlap wrote:
> linux-next of 2010-0519:
> when CONFIG_PCI is not enabled:
> 
> drivers/staging/comedi/drivers/mite.c: In function 'mite_init':
> drivers/staging/comedi/drivers/mite.c:89: error: implicit declaration of function 'pci_dev_get'
> drivers/staging/comedi/drivers/mite.c:89: warning: assignment makes pointer from integer without a cast
> make[5]: *** [drivers/staging/comedi/drivers/mite.o] Error 1

This patch fixes the problem.

Signed-off-by: Alexander Kurz 
Acked-by: Randy Dunlap 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: fix 8255 and DAS08 Kconfig dependancies.

2010-06-04T20:38:54+00:00

Both drivers support directly or indirectly multiple bus types,
hence both are listed independent of bus types.

Signed-off-by: Alexander Kurz 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: For COMEDI_BUFINFO, check access to command

2010-06-04T20:38:53+00:00

Don't allow COMEDI_BUFINFO ioctl if some other file object has locked
the subdevice or has an active command.  If there is no active command,
just report back the last buffer position.

Signed-off-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: COMEDI_BUFINFO with no async - report no bytes read or written

2010-06-04T20:38:53+00:00

When the COMEDI_BUFINFO ioctl is used on a subdevice without
asynchronous streaming command support, set 'bytes_read = 0' and
'bytes_written = 0' in the buffer info returned back to the user.

Signed-off-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: don't write to buffer if command finished

2010-06-04T20:38:53+00:00

For write(), any data copied to the data buffer after the previously
set up streaming acquisition command has finished won't be used, but a
non-empty write() does not currently return 0 (or -EPIPE on error) after
the command has finished until the data buffer has been filled up.
Change this behavior to return 0 (or -EPIPE) any time after the command
has finished, without bothering to fill up the buffer with more useless
data.

Signed-off-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman