diff options
Diffstat (limited to 'sound/pcmcia/pdaudiocf/pdaudiocf.c')
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index 2d4f8e28478b..c8622f5f7c3a 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c | |||
@@ -171,14 +171,6 @@ static dev_link_t *snd_pdacf_attach(void) | |||
171 | 171 | ||
172 | /* Register with Card Services */ | 172 | /* Register with Card Services */ |
173 | client_reg.dev_info = &dev_info; | 173 | client_reg.dev_info = &dev_info; |
174 | client_reg.EventMask = | ||
175 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | ||
176 | #ifdef CONFIG_PM | ||
177 | | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | ||
178 | | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME | ||
179 | #endif | ||
180 | ; | ||
181 | client_reg.event_handler = &pdacf_event; | ||
182 | client_reg.Version = 0x0210; | 174 | client_reg.Version = 0x0210; |
183 | client_reg.event_callback_args.client_data = link; | 175 | client_reg.event_callback_args.client_data = link; |
184 | 176 | ||
@@ -387,12 +379,13 @@ static struct pcmcia_device_id snd_pdacf_ids[] = { | |||
387 | MODULE_DEVICE_TABLE(pcmcia, snd_pdacf_ids); | 379 | MODULE_DEVICE_TABLE(pcmcia, snd_pdacf_ids); |
388 | 380 | ||
389 | static struct pcmcia_driver pdacf_cs_driver = { | 381 | static struct pcmcia_driver pdacf_cs_driver = { |
390 | .owner = THIS_MODULE, | 382 | .owner = THIS_MODULE, |
391 | .drv = { | 383 | .drv = { |
392 | .name = "snd-pdaudiocf", | 384 | .name = "snd-pdaudiocf", |
393 | }, | 385 | }, |
394 | .attach = snd_pdacf_attach, | 386 | .attach = snd_pdacf_attach, |
395 | .detach = snd_pdacf_detach, | 387 | .event = pdacf_event, |
388 | .detach = snd_pdacf_detach, | ||
396 | .id_table = snd_pdacf_ids, | 389 | .id_table = snd_pdacf_ids, |
397 | }; | 390 | }; |
398 | 391 | ||