Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de15d7fc authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

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



This fixes the build error in the cv_das16_cs driver

From: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarFrank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2ce492f5

drivers/staging/comedi/drivers/cb_das16_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link) 
	if ((last_ret = pcmcia_get_tuple_data(link, &tuple)) != 0)

		goto cs_failed;

	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;

	link->conf.ConfigBase = parse.config.base;

	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);

		if (pcmcia_get_tuple_data(link, &tuple))

			goto next_entry;

		if (pcmcia_parse_tuple(link, &tuple, &parse))

		if (pcmcia_parse_tuple(&tuple, &parse))

			goto next_entry;



		if (cfg->flags & CISTPL_CFTABLE_DEFAULT)