diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-02 02:02:01 +0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-02 02:02:01 +0400 |
| commit | e3ee3b78f83688a0ae4315e8be71b2eac559904a (patch) | |
| tree | deb03bcdd020262af450ed23382d7c921263f5cf /sound/pcmcia/vx/vxpocket.c | |
| parent | 91cb70c1769d9b72dd1efe40c31f01005820b09e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
| download | linux-e3ee3b78f83688a0ae4315e8be71b2eac559904a.tar.xz | |
/spare/repo/netdev-2.6 branch 'master'
Diffstat (limited to 'sound/pcmcia/vx/vxpocket.c')
| -rw-r--r-- | sound/pcmcia/vx/vxpocket.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index 3a82161d3b24..1e8f16b4c073 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c @@ -297,6 +297,7 @@ static void vxpocket_config(dev_link_t *link) CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf)); chip->dev = &handle_to_dev(link->handle); + snd_card_set_dev(chip->card, chip->dev); if (snd_vxpocket_assign_resources(chip, link->io.BasePort1, link->irq.AssignedIRQ) < 0) goto failed; @@ -376,7 +377,7 @@ static int vxpocket_event(event_t event, int priority, event_callback_args_t *ar /* */ -static dev_link_t *vxp_attach(void) +static dev_link_t *vxpocket_attach(void) { snd_card_t *card; struct snd_vxpocket *vxp; @@ -407,7 +408,7 @@ static dev_link_t *vxp_attach(void) return NULL; } - vxp->index = index[i]; + vxp->index = i; card_alloc |= 1 << i; /* Chain drivers */ @@ -417,7 +418,7 @@ static dev_link_t *vxp_attach(void) return &vxp->link; } -static void vxp_detach(dev_link_t *link) +static void vxpocket_detach(dev_link_t *link) { struct snd_vxpocket *vxp; vx_core_t *chip; @@ -458,8 +459,9 @@ static struct pcmcia_driver vxp_cs_driver = { .drv = { .name = "snd-vxpocket", }, - .attach = vxp_attach, - .detach = vxp_detach, + .attach = vxpocket_attach, + .detach = vxpocket_detach, + .event = vxpocket_event, .id_table = vxp_ids, }; |