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

staging: comedi: Fix reversed test in comedi_device_attach()

2012-08-14T23:52:17+00:00

Commit 3902a370281d2f2b130f141e8cf94eab40125769 (staging: comedi:
refactor comedi_device_attach() a bit) by yours truly introduced an
inverted logic bug in comedi_device_attach() for the case where the
driver expects the device to be configured by driver name rather than
board name.  The result of a strcmp() is being tested incorrectly.  Fix
it.

Thanks to Stephen N Chivers for discovering the bug and suggesting the
fix.

Cc:  # 3.5.x
Signed-off-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: remove comedi_fops.h

2012-06-20T19:56:55+00:00

Move the contents of "comedi_fops.h" into "comedi_internal.h" and delete
"comedi_fops.h". It only contains a couple of external variable
declarations (and #include ) and one of those isn't even
declared in "comedi_fops.c".  The other one is an external declaration
of a variable used to store a module parameter and some of those are
already externally declared in "comedi_internal.h", so they can keep it
company!

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

staging: comedi: rename internal.h to comedi_internal.h

2012-06-20T19:56:54+00:00

Use a less generic name for this internal header file included by
various parts of the comedi core.

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

Merge branch 'staging-linus' into staging-next

2012-06-13T23:57:09+00:00

We need this for the pstore fixes that went into the staging-linus branch, so
that things apply properly for the pstore/android code merge.

Signed-off-by: Greg Kroah-Hartman

staging: comedi: cleanup comedi_alloc_subdevices

2012-06-12T21:44:04+00:00

Access the individual comedi_subdevices using a pointer instead
of directly accessing as an array. This is how the rest of the
comedi core accesses them.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Cc: Frank Mori Hess 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: only set dev->n_subdevices when kcalloc succeedes

2012-06-12T21:44:03+00:00

It's possible for the kcalloc in comedi_alloc_subdevices to fail.
Only set the dev->n_subdevices variable if the allocation is
successful.

Since the core sets dev->n_subdevices, remove all the places in the
drivers where this variable was getting set.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Cc: Frank Mori Hess 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: sanity check num_subdevices parameter in comedi_alloc_subdevices

2012-06-12T21:44:03+00:00

It's possible for a couple of the comedi drivers to incorrectly call
comedi_alloc_subdevices with num_subdevices = 0. Add a sanity check
before doing the kcalloc.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Cc: Frank Mori Hess 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: change type of num_subdevices parameter to comedi_alloc_subdevices

2012-06-12T21:40:51+00:00

The n_subdevices variable of struct comedi_device is an int type.
Change the type of the comedi_alloc_subdevices 'num_subdevices' from
an unsigned int to an int to match it.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Cc: Frank Mori Hess 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: export alloc_subdevices as comedi_alloc_subdevices

2012-06-12T18:14:33+00:00

Move the inline alloc_subdevices() function from comedidev.h
to drivers.c and rename it to comedi_alloc_subdevices(). The
function is large enough to warrant being an exported symbol
rather than being an inline in every driver.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Cc: Frank Mori Hess 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: describe comedi_recognize()

2012-06-11T23:54:28+00:00

Add a comment to comedi_recognize() to describe what it does as it's a
bit confusing.

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