aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hardware/avm/avm_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/hardware/avm/avm_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/hardware/avm/avm_cs.c')
-rw-r--r--drivers/isdn/hardware/avm/avm_cs.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index e804a01ecdfb..7c8c51f22003 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -191,9 +191,10 @@ static int avmcs_config(struct pcmcia_device *link)
191 default: 191 default:
192 case AVM_CARDTYPE_B1: addcard = b1pcmcia_addcard_b1; break; 192 case AVM_CARDTYPE_B1: addcard = b1pcmcia_addcard_b1; break;
193 } 193 }
194 if ((i = (*addcard)(link->io.BasePort1, link->irq)) < 0) { 194 if ((i = (*addcard)(link->resource[0]->start, link->irq)) < 0) {
195 dev_err(&link->dev, "avm_cs: failed to add AVM-Controller at i/o %#x, irq %d\n", 195 dev_err(&link->dev,
196 link->io.BasePort1, link->irq); 196 "avm_cs: failed to add AVM-Controller at i/o %#x, irq %d\n",
197 (unsigned int) link->resource[0]->start, link->irq);
197 avmcs_release(link); 198 avmcs_release(link);
198 return -ENODEV; 199 return -ENODEV;
199 } 200 }
@@ -211,7 +212,7 @@ static int avmcs_config(struct pcmcia_device *link)
211 212
212static void avmcs_release(struct pcmcia_device *link) 213static void avmcs_release(struct pcmcia_device *link)
213{ 214{
214 b1pcmcia_delcard(link->io.BasePort1, link->irq); 215 b1pcmcia_delcard(link->resource[0]->start, link->irq);
215 pcmcia_disable_device(link); 216 pcmcia_disable_device(link);
216} /* avmcs_release */ 217} /* avmcs_release */
217 218