From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
Ian Abbott <abbotti@mev.co.uk>
Subject: [04/34] comedi: Uncripple 8255-based DIO subdevices
Date: Fri, 06 Aug 2010 11:56:59 -0700 [thread overview]
Message-ID: <20100806185834.195421116@clark.site> (raw)
In-Reply-To: <20100806185853.GA28270@kroah.com>
2.6.32-stable review patch. If anyone has any objections, please let us know.
------------------
(Note: upstream comedi configuration has been overhauled, so this patch
does not apply there.)
Several comedi drivers call subdev_8255_init() (declared in
"drivers/staging/comedi/drivers/8255.h") to set up one or more DIO
subdevices. This should be provided by the 8255.ko module, but unless
the CONFIG_COMEDI_8255 or CONFIG_COMEDI_8255_MODULE macro is defined,
the 8255.h header uses a dummy inline version of the function instead.
This means the comedi devices end up with an "unused" subdevice with 0
channels instead of a "DIO" subdevice with 24 channels!
This patch provides a non-interactive COMEDI_8255 option and selects it
whenever the COMEDI_PCI_DRIVERS or COMEDI_PCMCIA_DRIVERS options are
selected.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/staging/comedi/Kconfig | 5 +++++
drivers/staging/comedi/drivers/Makefile | 4 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -16,6 +16,7 @@ config COMEDI_DEBUG
config COMEDI_PCI_DRIVERS
tristate "Comedi PCI drivers"
depends on COMEDI && PCI
+ select COMEDI_8255
default N
---help---
Enable lots of comedi PCI drivers to be built
@@ -23,6 +24,7 @@ config COMEDI_PCI_DRIVERS
config COMEDI_PCMCIA_DRIVERS
tristate "Comedi PCMCIA drivers"
depends on COMEDI && PCMCIA && PCCARD
+ select COMEDI_8255
default N
---help---
Enable lots of comedi PCMCIA and PCCARD drivers to be built
@@ -33,3 +35,6 @@ config COMEDI_USB_DRIVERS
default N
---help---
Enable lots of comedi USB drivers to be built
+
+config COMEDI_8255
+ tristate
--- a/drivers/staging/comedi/drivers/Makefile
+++ b/drivers/staging/comedi/drivers/Makefile
@@ -8,8 +8,10 @@ obj-$(CONFIG_COMEDI) += comedi_test.o
obj-$(CONFIG_COMEDI) += comedi_parport.o
obj-$(CONFIG_COMEDI) += pcm_common.o
+# Comedi 8255 module
+obj-$(CONFIG_COMEDI_8255) += 8255.o
+
# Comedi PCI drivers
-obj-$(CONFIG_COMEDI_PCI_DRIVERS) += 8255.o
obj-$(CONFIG_COMEDI_PCI_DRIVERS) += acl7225b.o
obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_035.o
obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_1032.o
next prev parent reply other threads:[~2010-08-06 19:00 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-06 18:58 [00/34] 2.6.32.18-stable review Greg KH
2010-08-06 18:56 ` [01/34] sched: cgroup: Implement different treatment for idle shares Greg KH
2010-08-06 18:56 ` [02/34] mm: fix ia64 crash when gcore reads gate area Greg KH
2010-08-06 18:56 ` [03/34] Re: acl trouble after upgrading ubuntu Greg KH
2010-08-06 18:56 ` Greg KH [this message]
2010-08-06 18:57 ` [05/34] NFS: kswapd must not block in nfs_release_page Greg KH
2010-08-06 18:57 ` [06/34] PARISC: led.c - fix potential stack overflow in led_proc_write() Greg KH
2010-08-06 18:57 ` [07/34] arm/imx/gpio: add spinlock protection Greg KH
2010-08-06 18:57 ` [08/34] parisc: pass through \t to early (iodc) console Greg KH
2010-08-06 18:57 ` [09/34] amd64_edac: Fix DCT base address selector Greg KH
2010-08-06 18:57 ` [10/34] amd64_edac: Correct scrub rate setting Greg KH
2010-08-06 18:57 ` [11/34] e1000e: dont inadvertently re-set INTX_DISABLE Greg KH
2010-08-06 18:57 ` [12/34] e1000e: 82577/82578 PHY register access issues Greg KH
2010-08-06 18:57 ` [13/34] 9p: strlen() doesnt count the terminator Greg KH
2010-08-06 18:57 ` [14/34] ath9k: enable serialize_regmode for non-PCIE AR9160 Greg KH
2010-08-06 18:57 ` [15/34] ath9k_hw: fix an off-by-one error in the PDADC boundaries calculation Greg KH
2010-08-06 18:57 ` [16/34] ath9k: fix TSF after reset on AR913x Greg KH
2010-08-06 18:57 ` [17/34] ath9k: fix yet another buffer leak in the tx aggregation code Greg KH
2010-08-06 18:57 ` [18/34] iwlwifi: fix scan abort Greg KH
2010-08-06 18:57 ` [19/34] cfg80211: ignore spurious deauth Greg KH
2010-08-06 18:57 ` [20/34] cfg80211: dont get expired BSSes Greg KH
2010-08-06 18:57 ` [21/34] xfs: prevent swapext from operating on write-only files Greg KH
2010-08-06 18:57 ` [22/34] SCSI: enclosure: fix error path - actually return ERR_PTR() on error Greg KH
2010-08-06 18:57 ` [23/34] GFS2: rename causes kernel Oops Greg KH
2010-08-06 18:57 ` [24/34] slow-work: use get_ref wrapper instead of directly calling get_ref Greg KH
2010-08-06 18:57 ` [25/34] CIFS: Remove __exit mark from cifs_exit_dns_resolver() Greg KH
2010-08-06 18:57 ` [26/34] CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition Greg KH
2010-08-06 20:53 ` [Stable-review] " Ben Hutchings
2010-08-06 21:06 ` Greg KH
2010-08-07 3:38 ` Michael Neuling
2010-08-06 18:57 ` [27/34] xen: drop xen_sched_clock in favour of using plain wallclock time Greg KH
2010-08-06 18:57 ` [28/34] drm/i915: Fix LVDS presence check Greg KH
2010-08-06 18:57 ` [29/34] drm/i915: parse child device from VBT Greg KH
2010-08-06 18:57 ` [30/34] Revert "ssb: Handle Netbook devices where the SPROM address is changed" Greg KH
2010-08-06 18:57 ` [31/34] ssb: do not read SPROM if it does not exist Greg KH
2010-08-06 18:57 ` [32/34] ssb: Look for SPROM at different offset on higher rev CC Greg KH
2010-08-06 18:57 ` [33/34] ssb: fix NULL ptr deref when pcihost_wrapper is used Greg KH
2010-08-06 18:57 ` [34/34] ssb: Handle alternate SSPROM location Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100806185834.195421116@clark.site \
--to=gregkh@suse.de \
--cc=abbotti@mev.co.uk \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).