diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-07-24 09:58:54 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-08-03 03:03:59 -0400 |
commit | 9a017a910346afd88ec2e065989903bf211a7d37 (patch) | |
tree | b407945c6e762f252bb81ae0fd64c745bba2ad11 /sound/pcmcia | |
parent | 2ce4905e4da9f512b38f56a53ece9da2072dd164 (diff) |
pcmcia: do not use io_req_t after call to pcmcia_request_io()
After pcmcia_request_io(), do not make use of the values stored in
io_req_t, but instead use those found in struct pcmcia_device->resource[].
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
Acked-by: Marcel Holtmann <marcel@holtmann.org> (for drivers/bluetooth/)
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'sound/pcmcia')
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 3 | ||||
-rw-r--r-- | sound/pcmcia/vx/vxpocket.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index df110df52a8b..9f897bca0615 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c | |||
@@ -231,7 +231,8 @@ static int pdacf_config(struct pcmcia_device *link) | |||
231 | if (ret) | 231 | if (ret) |
232 | goto failed; | 232 | goto failed; |
233 | 233 | ||
234 | if (snd_pdacf_assign_resources(pdacf, link->io.BasePort1, link->irq) < 0) | 234 | if (snd_pdacf_assign_resources(pdacf, link->resource[0]->start, |
235 | link->irq) < 0) | ||
235 | goto failed; | 236 | goto failed; |
236 | 237 | ||
237 | return 0; | 238 | return 0; |
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index 624b47a85f0a..f23c235013a4 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c | |||
@@ -241,7 +241,8 @@ static int vxpocket_config(struct pcmcia_device *link) | |||
241 | chip->dev = &link->dev; | 241 | chip->dev = &link->dev; |
242 | snd_card_set_dev(chip->card, chip->dev); | 242 | snd_card_set_dev(chip->card, chip->dev); |
243 | 243 | ||
244 | if (snd_vxpocket_assign_resources(chip, link->io.BasePort1, link->irq) < 0) | 244 | if (snd_vxpocket_assign_resources(chip, link->resource[0]->start, |
245 | link->irq) < 0) | ||
245 | goto failed; | 246 | goto failed; |
246 | 247 | ||
247 | return 0; | 248 | return 0; |