Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 7 insertions, 12 deletions

diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index d58e22b9f06a..027cb8bf650f 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -345,7 +345,9 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)
         int iir;
         irqreturn_t r = IRQ_NONE;
 
-        BUG_ON(!info->hdev);
+        if (!info || !info->hdev)
+                /* our irq handler is shared */
+                return IRQ_NONE;
 
         iobase = info->p_dev->io.BasePort1;
 
@@ -580,7 +582,7 @@ static int bt3c_open(bt3c_info_t *info)
 
         info->hdev = hdev;
 
-        hdev->type = HCI_PCCARD;
+        hdev->bus = HCI_PCCARD;
         hdev->driver_data = info;
         SET_HCIDEV_DEV(hdev, &info->p_dev->dev);
 
@@ -659,11 +661,9 @@ static int bt3c_probe(struct pcmcia_device *link)
 
         link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
         link->io.NumPorts1 = 8;
-        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
-        link->irq.IRQInfo1 = IRQ_LEVEL_ID;
+        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
 
         link->irq.Handler = bt3c_interrupt;
-        link->irq.Instance = info;
 
         link->conf.Attributes = CONF_ENABLE_IRQ;
         link->conf.IntType = INT_MEMORY_AND_IO;
@@ -740,21 +740,16 @@ static int bt3c_config(struct pcmcia_device *link)
                 goto found_port;
 
         BT_ERR("No usable port range found");
-        cs_error(link, RequestIO, -ENODEV);
         goto failed;
 
 found_port:
         i = pcmcia_request_irq(link, &link->irq);
-        if (i != 0) {
-                cs_error(link, RequestIRQ, i);
+        if (i != 0)
                 link->irq.AssignedIRQ = 0;
-        }
 
         i = pcmcia_request_configuration(link, &link->conf);
-        if (i != 0) {
-                cs_error(link, RequestConfiguration, i);
+        if (i != 0)
                 goto failed;
-        }
 
         if (bt3c_open(info) != 0)
                 goto failed;