linux.git/drivers/staging/comedi, branch v2.6.33

Staging: comedi: jr3_pci: Don't ioremap too much space. Check result.

2009-12-23T19:27:46+00:00

For the JR3/PCI cards, the size of the PCIBAR0 region depends on the
number of channels.  Don't try and ioremap space for 4 channels if the
card has fewer channels.  Also check for ioremap failure.

Thanks to Anders Blomdell for input and Sami Hussein for testing.

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

Staging: comedi: removed "depricated" from COMEDI_CB_BLOCK

2009-12-23T19:27:45+00:00

The flag COMEDI_CB_BLOCK was marked as "depricated in the header file".
However, this flag is important to wake up the data-reader (and writer)
after new data has arrived from(for) the DAQ card.


Signed-off-by: Bernd Porr 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: usbdux.c: fix locking up of the driver when the comedi ringbuffer runs empty

2009-12-23T19:27:45+00:00

Jan-Matthias Braun spotted a bug which locks up the driver when the
comedi ring buffer runs empty and provided a patch. The driver would
still send the data to comedi but the reader won't wake up any more.
What's required is setting the flag COMEDI_CB_BLOCK after new data has
arrived which wakes up the reader and therefore the read() command.

Signed-off-by: Bernd Porr 
Signed-off-by: Greg Kroah-Hartman

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2009-12-11T23:25:56+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (235 commits)
  Staging: IIO: add selection of IIO_SW_RING to LIS3L02DQ as needed
  Staging: IIO: Add tsl2560-2 support to tsl2563 driver.
  Staging: IIO: Remove tsl2561 driver. Support merged with tsl2563.
  Staging: wlags49_h2: fix up signal levels
  + drivers-staging-wlags49_h2-remove-cvs-metadata.patch added to -mm tree
  Staging: samsung-laptop: add TODO file
  Staging: samsung-laptop: remove old kernel code
  Staging: add Samsung Laptop driver
  staging: batman-adv meshing protocol
  Staging: rtl8192u: depends on USB
  Staging: rtl8192u: remove dead code
  Staging: rtl8192u: remove bad whitespaces
  Staging: rtl8192u: make it compile
  Staging: Added Realtek rtl8192u driver to staging
  Staging: dream: add gpio and pmem support
  Staging: dream: add TODO file
  Staging: android: delete android drivers
  Staging: et131x: clean up the avail fields in the rx registers
  Staging: et131x: Clean up number fields
  Staging: et131x: kill RX_DMA_MAX_PKT_TIME
  ...

Staging: fix assorted typos all over the place

2009-12-11T20:23:20+00:00

Signed-off-by: André Goddard Rosa 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: pcl816: update convert_src mask for AI cmdtest

2009-12-11T20:23:04+00:00

The COMEDI_CMDTEST ioctl needs to clear unsupported bits in the
struct comedi_cmd's convert_src and other *_src members.  This
needs fixing in the pcl816 driver's AI cmdtest.

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

Staging: comedi: initialize divisor variables

2009-12-11T20:23:04+00:00

The i8253_cascade_ns_to_timer_2div() function (and
i8253_cascade_ns_to_timer macro) checks the old values *d1 and *d2
for correctness as a heuristic before calculating new values.  Don't
call the function with uninitialized values in *d1 and *d2.

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

Staging: comedi: serial2002: decrease stack usage

2009-12-11T20:23:04+00:00

512 bytes of stack can be saved in serial_2002_open() by modifying
'struct config_t'.  A short int suffices for the 'kind' and 'bits'
members.  (Actually, a char would suffice, but wouldn't save any more
stack than a short int.)

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

Staging: comedi: fix usbdux timeout bug

2009-12-11T20:23:03+00:00

I've fixed a bug in the USBDUX driver which caused timeouts while
sending commands to the boards. This was mainly because of one bulk
transfer which had a timeout of 1ms (!). I've now set all timeouts to
1000ms.

From: Bernd Porr 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: ke_counter: fix style issues

2009-12-11T20:23:03+00:00

80 char limit (where useful)
braces around single line block
KERN_ facility for printk

Signed-off-by: Dirk Hohndel 
Signed-off-by: Greg Kroah-Hartman