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 /drivers/bluetooth/bt3c_cs.c | |
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 'drivers/bluetooth/bt3c_cs.c')
-rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 457b603f8678..8ab494c0c17f 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
@@ -188,7 +188,7 @@ static void bt3c_write_wakeup(bt3c_info_t *info) | |||
188 | return; | 188 | return; |
189 | 189 | ||
190 | do { | 190 | do { |
191 | register unsigned int iobase = info->p_dev->io.BasePort1; | 191 | register unsigned int iobase = info->p_dev->resource[0]->start; |
192 | register struct sk_buff *skb; | 192 | register struct sk_buff *skb; |
193 | register int len; | 193 | register int len; |
194 | 194 | ||
@@ -226,7 +226,7 @@ static void bt3c_receive(bt3c_info_t *info) | |||
226 | return; | 226 | return; |
227 | } | 227 | } |
228 | 228 | ||
229 | iobase = info->p_dev->io.BasePort1; | 229 | iobase = info->p_dev->resource[0]->start; |
230 | 230 | ||
231 | avail = bt3c_read(iobase, 0x7006); | 231 | avail = bt3c_read(iobase, 0x7006); |
232 | //printk("bt3c_cs: receiving %d bytes\n", avail); | 232 | //printk("bt3c_cs: receiving %d bytes\n", avail); |
@@ -347,7 +347,7 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst) | |||
347 | /* our irq handler is shared */ | 347 | /* our irq handler is shared */ |
348 | return IRQ_NONE; | 348 | return IRQ_NONE; |
349 | 349 | ||
350 | iobase = info->p_dev->io.BasePort1; | 350 | iobase = info->p_dev->resource[0]->start; |
351 | 351 | ||
352 | spin_lock(&(info->lock)); | 352 | spin_lock(&(info->lock)); |
353 | 353 | ||
@@ -480,7 +480,7 @@ static int bt3c_load_firmware(bt3c_info_t *info, const unsigned char *firmware, | |||
480 | unsigned int iobase, size, addr, fcs, tmp; | 480 | unsigned int iobase, size, addr, fcs, tmp; |
481 | int i, err = 0; | 481 | int i, err = 0; |
482 | 482 | ||
483 | iobase = info->p_dev->io.BasePort1; | 483 | iobase = info->p_dev->resource[0]->start; |
484 | 484 | ||
485 | /* Reset */ | 485 | /* Reset */ |
486 | bt3c_io_write(iobase, 0x8040, 0x0404); | 486 | bt3c_io_write(iobase, 0x8040, 0x0404); |