vserver 2.0 rc7

[linux-2.6.git] / sound / pcmcia / pdaudiocf / pdaudiocf.c

diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index e31a990..f72c81c 100644 (file)
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -272,12 +272,17 @@ static void pdacf_config(dev_link_t *link)
        client_handle_t handle = link->handle;
        pdacf_t *pdacf = link->priv;
        tuple_t tuple;
-       cisparse_t parse;
+       cisparse_t *parse = NULL;
        config_info_t conf;
        u_short buf[32];
        int last_fn, last_ret;
 
        snd_printdd(KERN_DEBUG "pdacf_config called\n");
+       parse = kmalloc(sizeof(*parse), GFP_KERNEL);
+       if (! parse) {
+               snd_printk(KERN_ERR "pdacf_config: cannot allocate\n");
+               return;
+       }
        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
        tuple.Attributes = 0;
        tuple.TupleData = (cisdata_t *)buf;
@@ -286,9 +291,10 @@ static void pdacf_config(dev_link_t *link)
        tuple.DesiredTuple = CISTPL_CONFIG;
        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-       CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
-       link->conf.ConfigBase = parse.config.base;
+       CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, parse));
+       link->conf.ConfigBase = parse->config.base;
        link->conf.ConfigIndex = 0x5;
+       kfree(parse);
 
        CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
        link->conf.Vcc = conf.Vcc;
@@ -342,7 +348,7 @@ static int pdacf_event(event_t event, int priority, event_callback_args_t *args)
                link->state |= DEV_SUSPEND;
                if (chip) {
                        snd_printdd(KERN_DEBUG "snd_pdacf_suspend calling\n");
-                       snd_pdacf_suspend(chip->card, 0);
+                       snd_pdacf_suspend(chip->card, PMSG_SUSPEND);
                }
                /* Fall through... */
        case CS_EVENT_RESET_PHYSICAL:
@@ -361,7 +367,7 @@ static int pdacf_event(event_t event, int priority, event_callback_args_t *args)
                        pcmcia_request_configuration(link->handle, &link->conf);
                        if (chip) {
                                snd_printdd(KERN_DEBUG "calling snd_pdacf_resume\n");
-                               snd_pdacf_resume(chip->card, 0);
+                               snd_pdacf_resume(chip->card);
                        }
                }
                snd_printdd(KERN_DEBUG "resume done!\n");