From: Ian Abbott Date: Mon, 6 Apr 2009 19:10:30 +0000 (-0400) Subject: Staging: comedi: 'pcmcia_parse_tuple()' now has two arguments, not three. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=de15d7fcd6452894e82657fb44b7b93c2afe97a4;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git 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 Signed-off-by: Frank Mori Hess Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c index 0dd9630cfdfd..e7ba3e4288a1 100644 --- a/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/drivers/staging/comedi/drivers/cb_das16_cs.c @@ -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)