aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/avma1_cs.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-24 09:58:54 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-08-03 03:03:59 -0400
commit9a017a910346afd88ec2e065989903bf211a7d37 (patch)
treeb407945c6e762f252bb81ae0fd64c745bba2ad11 /drivers/isdn/hisax/avma1_cs.c
parent2ce4905e4da9f512b38f56a53ece9da2072dd164 (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 'drivers/isdn/hisax/avma1_cs.c')
-rw-r--r--drivers/isdn/hisax/avma1_cs.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 49e141e49aa..88899638f83 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -180,16 +180,18 @@ static int __devinit avma1cs_config(struct pcmcia_device *link)
180 } 180 }
181 181
182 printk(KERN_NOTICE "avma1_cs: checking at i/o %#x, irq %d\n", 182 printk(KERN_NOTICE "avma1_cs: checking at i/o %#x, irq %d\n",
183 link->io.BasePort1, link->irq); 183 (unsigned int) link->resource[0]->start, link->irq);
184 184
185 icard.para[0] = link->irq; 185 icard.para[0] = link->irq;
186 icard.para[1] = link->io.BasePort1; 186 icard.para[1] = link->resource[0]->start;
187 icard.protocol = isdnprot; 187 icard.protocol = isdnprot;
188 icard.typ = ISDN_CTYPE_A1_PCMCIA; 188 icard.typ = ISDN_CTYPE_A1_PCMCIA;
189 189
190 i = hisax_init_pcmcia(link, &busy, &icard); 190 i = hisax_init_pcmcia(link, &busy, &icard);
191 if (i < 0) { 191 if (i < 0) {
192 printk(KERN_ERR "avma1_cs: failed to initialize AVM A1 PCMCIA %d at i/o %#x\n", i, link->io.BasePort1); 192 printk(KERN_ERR "avma1_cs: failed to initialize AVM A1 "
193 "PCMCIA %d at i/o %#x\n", i,
194 (unsigned int) link->resource[0]->start);
193 avma1cs_release(link); 195 avma1cs_release(link);
194 return -ENODEV; 196 return -ENODEV;
195 } 197 }