aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/btuart_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/bluetooth/btuart_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/bluetooth/btuart_cs.c')
-rw-r--r--drivers/bluetooth/btuart_cs.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index e7e0a17aecc2..7e770d40368d 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -142,7 +142,7 @@ static void btuart_write_wakeup(btuart_info_t *info)
142 } 142 }
143 143
144 do { 144 do {
145 register unsigned int iobase = info->p_dev->io.BasePort1; 145 register unsigned int iobase = info->p_dev->resource[0]->start;
146 register struct sk_buff *skb; 146 register struct sk_buff *skb;
147 register int len; 147 register int len;
148 148
@@ -183,7 +183,7 @@ static void btuart_receive(btuart_info_t *info)
183 return; 183 return;
184 } 184 }
185 185
186 iobase = info->p_dev->io.BasePort1; 186 iobase = info->p_dev->resource[0]->start;
187 187
188 do { 188 do {
189 info->hdev->stat.byte_rx++; 189 info->hdev->stat.byte_rx++;
@@ -297,7 +297,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
297 /* our irq handler is shared */ 297 /* our irq handler is shared */
298 return IRQ_NONE; 298 return IRQ_NONE;
299 299
300 iobase = info->p_dev->io.BasePort1; 300 iobase = info->p_dev->resource[0]->start;
301 301
302 spin_lock(&(info->lock)); 302 spin_lock(&(info->lock));
303 303
@@ -354,7 +354,7 @@ static void btuart_change_speed(btuart_info_t *info, unsigned int speed)
354 return; 354 return;
355 } 355 }
356 356
357 iobase = info->p_dev->io.BasePort1; 357 iobase = info->p_dev->resource[0]->start;
358 358
359 spin_lock_irqsave(&(info->lock), flags); 359 spin_lock_irqsave(&(info->lock), flags);
360 360
@@ -478,7 +478,7 @@ static int btuart_hci_ioctl(struct hci_dev *hdev, unsigned int cmd, unsigned lon
478static int btuart_open(btuart_info_t *info) 478static int btuart_open(btuart_info_t *info)
479{ 479{
480 unsigned long flags; 480 unsigned long flags;
481 unsigned int iobase = info->p_dev->io.BasePort1; 481 unsigned int iobase = info->p_dev->resource[0]->start;
482 struct hci_dev *hdev; 482 struct hci_dev *hdev;
483 483
484 spin_lock_init(&(info->lock)); 484 spin_lock_init(&(info->lock));
@@ -548,7 +548,7 @@ static int btuart_open(btuart_info_t *info)
548static int btuart_close(btuart_info_t *info) 548static int btuart_close(btuart_info_t *info)
549{ 549{
550 unsigned long flags; 550 unsigned long flags;
551 unsigned int iobase = info->p_dev->io.BasePort1; 551 unsigned int iobase = info->p_dev->resource[0]->start;
552 struct hci_dev *hdev = info->hdev; 552 struct hci_dev *hdev = info->hdev;
553 553
554 if (!hdev) 554 if (!hdev)