lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: comedi: 'pcmcia_parse_tuple()' now has two arguments, not three.

Browse Source 
This fixes the build error in the cv_das16_cs driver

From: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Ian Abbott
2009-04-06 15:10:30 -04:00
committed by Greg Kroah-Hartman
parent 2ce492f5cb
commit de15d7fcd6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/comedi/drivers/cb_das16_cs.c
View File

@@ -773,7 +773,7 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link)
if ((last_ret = pcmcia_get_tuple_data(link, &tuple)) != 0) if ((last_ret = pcmcia_get_tuple_data(link, &tuple)) != 0)
goto cs_failed; goto cs_failed;
last_fn = ParseTuple; last_fn = ParseTuple;
if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse)) != 0) if ((last_ret = pcmcia_parse_tuple(&tuple, &parse)) != 0)
goto cs_failed; goto cs_failed;
link->conf.ConfigBase = parse.config.base; link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0]; link->conf.Present = parse.config.rmask[0];
@@ -798,7 +798,7 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link)
cistpl_cftable_entry_t *cfg = &(parse.cftable_entry); cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
if (pcmcia_get_tuple_data(link, &tuple)) if (pcmcia_get_tuple_data(link, &tuple))
goto next_entry; goto next_entry;
if (pcmcia_parse_tuple(link, &tuple, &parse)) if (pcmcia_parse_tuple(&tuple, &parse))
goto next_entry; goto next_entry;
if (cfg->flags & CISTPL_CFTABLE_DEFAULT) if (cfg->flags & CISTPL_CFTABLE_DEFAULT)