linux-stable.git/drivers/staging/comedi, branch v3.1.7

Staging: comedi: fix signal handling in read and write

2011-12-09T16:54:45+00:00

commit 6a9ce6b654e491981f6ef7e214cbd4f63e033848 upstream.

After sleeping on a wait queue, signal_pending(current) should be
checked (not before sleeping).

Acked-by: Alessandro Rubini 
Signed-off-by: Federico Vaga 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: fix mmap_count

2011-12-09T16:54:42+00:00

commit df30b21cb0eed5ba8a8e0cdfeebc66ba8cde821d upstream.

In comedi_fops, mmap_count is decremented at comedi_vm_ops->close but
it is not incremented at comedi_vm_ops->open. This may result in a negative
counter.  The patch introduces the open method to keep the counter
consistent.

The bug was triggerd by this sample code:

        mmap(0, ...., comedi_fd);
        fork();
        exit(0);

Acked-by: Alessandro Rubini 
Signed-off-by: Federico Vaga 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: fix oops for USB DAQ devices.

2011-12-09T16:54:39+00:00

commit 3ffab428f40849ed5f21bcfd7285bdef7902f9ca upstream.

This fixes kernel oops when an USB DAQ device is plugged out while it's
communicating with the userspace software.

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

staging: fix comedi build when ISA_DMA_API is enabled but COMEDI_PCI is not enabled

2011-09-20T00:15:46+00:00

Fix build when CONFIG_ISA_DMA_API is enabled but
CONFIG_COMEDI_PCI[_DRIVERS] is not enabled.

Fixes these build errors:

  drivers/staging/comedi/drivers/ni_labpc.c: In function 'labpc_ai_cmd':
  drivers/staging/comedi/drivers/ni_labpc.c:1351: error: implicit declaration of function 'labpc_suggest_transfer_size'
  drivers/staging/comedi/drivers/ni_labpc.c: At top level:
  drivers/staging/comedi/drivers/ni_labpc.c:1802: error: conflicting types for 'labpc_suggest_transfer_size'
  drivers/staging/comedi/drivers/ni_labpc.c:1351: note: previous implicit declaration of 'labpc_suggest_transfer_size' was here

Signed-off-by: Randy Dunlap 
Signed-off-by: Greg Kroah-Hartman 
Signed-off-by: Linus Torvalds

Staging: comedi: fix printk issue in rtd520.c

2011-07-08T21:11:18+00:00

This is a patch to the rtd520.c file that fixes up a printk  warning found by the checkpatch.pl tool

Signed-off-by: Ravishankr 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: fix line over 80 character issue in rtd520.c

2011-07-08T21:11:17+00:00

This is a patch to the rtd520.c file that fixes up a  warning: line over 80 character found by the checkpatch.pl tool

Signed-off-by: Ravishankar 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: fix warning issue in unioxx5.c

2011-07-08T20:59:55+00:00

This is a patch to the unioxx5.c file that fixes up a  warning found by the checkpatch.pl tool

Signed-off-by: Ravishankar 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: fix brace coding style issue in serial2002.c

2011-07-08T20:59:54+00:00

This is a patch to the serial2002.c file that fixes up a brace warning found by the checkpatch.pl tool

Signed-off-by: Ravishankar 
Signed-off-by: Greg Kroah-Hartman

Staging: comedi: fix brace and printk coding style issue in serial2002.c

2011-07-08T20:59:54+00:00

This is a patch to the serial2002.c file that fixes up a brace and printk  warning found by the checkpatch.pl tool

Signed-off-by: Ravishankar 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: remove COMEDI_DEVICE_CREATE macro, expand all callers

2011-07-06T15:22:49+00:00

This is no longer needed as the code is now in the main kernel tree.

Signed-off-by: Pavel Roskin 
Cc: Frank Mori Hess 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman