Messages in this thread | | | Subject | Re: [PATCH v2] staging: comedi: labpc: fix isadma dependency | From | Ian Abbott <> | Date | Thu, 30 Mar 2017 10:02:23 +0100 |
| |
On 29/03/17 22:10, Arnd Bergmann wrote: > When COMEDI_NI_LABPC is built-in and COMEDI_NI_LABPC_ISA is a loadable > module, thhe ISA DMA code is not reachable by the common module, causing > a link error: > > drivers/staging/built-in.o: In function `labpc_interrupt': > ni_labpc_common.c:(.text+0x1d178): undefined reference to `labpc_handle_dma_status' > ni_labpc_common.c:(.text+0x1d1cb): undefined reference to `labpc_drain_dma' > drivers/staging/built-in.o: In function `labpc_ai_cmd': > ni_labpc_common.c:(.text+0x1d8ad): undefined reference to `labpc_setup_dma' > > This changes the definition of COMEDI_NI_LABPC_ISADMA so that it will > also be builtin for that case. This looks like a rather old bug, but > I have never seen this in randconfig testing until today.
That's because the comedi stuff has only recently been configurable as built-in.
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/staging/comedi/Kconfig | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > v2: fix typo from first version, forgot to amend the patch after successfully > testing until I had sent it out. > > diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig > index 6079c23237d5..7a655ed071a3 100644 > --- a/drivers/staging/comedi/Kconfig > +++ b/drivers/staging/comedi/Kconfig > @@ -505,7 +505,6 @@ config COMEDI_NI_ATMIO16D > config COMEDI_NI_LABPC_ISA > tristate "NI Lab-PC and compatibles ISA support" > select COMEDI_NI_LABPC > - select COMEDI_NI_LABPC_ISADMA if ISA_DMA_API > ---help--- > Enable support for National Instruments Lab-PC and compatibles > Lab-PC-1200, Lab-PC-1200AI, Lab-PC+. > @@ -1315,6 +1314,9 @@ config COMEDI_NI_LABPC > > config COMEDI_NI_LABPC_ISADMA > tristate > + default COMEDI_NI_LABPC > + depends on COMEDI_NI_LABPC_ISA != n > + depends on ISA_DMA_API > select COMEDI_ISADMA > > config COMEDI_NI_TIO >
Thanks for the fix!
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
-- -=( Ian Abbott @ MEV Ltd. E-mail: <abbotti@mev.co.uk> )=- -=( Web: http://www.mev.co.uk/ )=-
| |