10 files changed, 31 insertions, 11 deletions

diff --git a/drivers/isdn/divert/isdn_divert.c b/drivers/isdn/divert/isdn_divert.c
index f1a1f9a9b88e..1f5ebe9ee72c 100644
--- a/drivers/isdn/divert/isdn_divert.c
+++ b/drivers/isdn/divert/isdn_divert.c
@@ -592,7 +592,7 @@ static int put_address(char *st, u_char *p, int len)
 } /* put_address */
 
 /*************************************/
-/* report a succesfull interrogation */
+/* report a successful interrogation */
 /*************************************/
 static int interrogate_success(isdn_ctrl *ic, struct call_struc *cs)
 { char *src = ic->parm.dss1_io.data;
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 578e6797ef04..aca165d43aa0 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -981,7 +981,7 @@ exit:
 EXPORT_SYMBOL_GPL(gigaset_stop);
 
 static LIST_HEAD(drivers);
-static spinlock_t driver_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(driver_lock);
 
 struct cardstate *gigaset_get_cs_by_id(int id)
 {
diff --git a/drivers/isdn/hardware/avm/b1pcmcia.c b/drivers/isdn/hardware/avm/b1pcmcia.c
index 9746cc5ffff8..ad5025155b4e 100644
--- a/drivers/isdn/hardware/avm/b1pcmcia.c
+++ b/drivers/isdn/hardware/avm/b1pcmcia.c
@@ -82,7 +82,7 @@ static int b1pcmcia_add_card(unsigned int port, unsigned irq,
         card->irq = irq;
         card->cardtype = cardtype;
 
-        retval = request_irq(card->irq, b1_interrupt, 0, card->name, card);
+        retval = request_irq(card->irq, b1_interrupt, SA_SHIRQ, card->name, card);
         if (retval) {
                 printk(KERN_ERR "b1pcmcia: unable to get IRQ %d.\n",
                        card->irq);
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c
index 91d25acb5ede..3622720f0505 100644
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
@@ -1688,7 +1688,7 @@ setup_hfcpci(struct IsdnCard *card)
                                 printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n");
                                 return (0);
                         }
-                        cs->hw.hfcpci.pci_io = (char *) dev_hfcpci->resource[ 1].start;
+                        cs->hw.hfcpci.pci_io = (char *)(unsigned long)dev_hfcpci->resource[1].start;
                         printk(KERN_INFO "HiSax: HFC-PCI card manufacturer: %s card name: %s\n", id_list[i].vendor_name, id_list[i].card_name);
                 } else {
                         printk(KERN_WARNING "HFC-PCI: No PCI card found\n");
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index 9bb18f3f7829..f9c14a2970bc 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -164,7 +164,7 @@ static int sedlbauer_probe(struct pcmcia_device *link)
     link->priv = local;
 
     /* Interrupt setup */
-    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
     link->irq.IRQInfo1 = IRQ_LEVEL_ID;
     link->irq.Handler = NULL;
 
diff --git a/drivers/isdn/hisax/teles3.c b/drivers/isdn/hisax/teles3.c
index a3eaf4d65707..090abd16b4bc 100644
--- a/drivers/isdn/hisax/teles3.c
+++ b/drivers/isdn/hisax/teles3.c
@@ -369,6 +369,7 @@ setup_teles3(struct IsdnCard *card)
                                cs->hw.teles3.hscx[1] + 96);
                         return (0);
                 }
+                cs->irq_flags |= SA_SHIRQ; /* cardbus can share */
         } else {
                 if (cs->hw.teles3.cfg_reg) {
                         if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) {
diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c
index e2bb4fd8e25e..e82ab2251b82 100644
--- a/drivers/isdn/hisax/telespci.c
+++ b/drivers/isdn/hisax/telespci.c
@@ -311,8 +311,9 @@ setup_telespci(struct IsdnCard *card)
                 }
                 cs->hw.teles0.membase = ioremap(pci_resource_start(dev_tel, 0),
                         PAGE_SIZE);
-                printk(KERN_INFO "Found: Zoran, base-address: 0x%lx, irq: 0x%x\n",
-                        pci_resource_start(dev_tel, 0), dev_tel->irq);
+                printk(KERN_INFO "Found: Zoran, base-address: 0x%llx, irq: 0x%x\n",
+                        (unsigned long long)pci_resource_start(dev_tel, 0),
+                        dev_tel->irq);
         } else {
                 printk(KERN_WARNING "TelesPCI: No PCI card found\n");
                 return(0);
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 81accdf35168..eb21063e6f63 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -340,6 +340,16 @@ isdn_command(isdn_ctrl *cmd)
                 printk(KERN_WARNING "isdn_command command(%x) driver -1\n", cmd->command);
                 return(1);
         }
+        if (!dev->drv[cmd->driver]) {
+                printk(KERN_WARNING "isdn_command command(%x) dev->drv[%d] NULL\n",
+                        cmd->command, cmd->driver);
+                return(1);
+        }
+        if (!dev->drv[cmd->driver]->interface) {
+                printk(KERN_WARNING "isdn_command command(%x) dev->drv[%d]->interface NULL\n",
+                        cmd->command, cmd->driver);
+                return(1);
+        }
         if (cmd->command == ISDN_CMD_SETL2) {
                 int idx = isdn_dc2minor(cmd->driver, cmd->arg & 255);
                 unsigned long l2prot = (cmd->arg >> 8) & 255;
@@ -933,7 +943,7 @@ isdn_readbchan_tty(int di, int channel, struct tty_struct *tty, int cisco_hack)
                         count_put = count_pull;
                         if(count_put > 1)
                                 tty_insert_flip_string(tty, skb->data, count_put - 1);
-                        last = skb->data[count_put] - 1;
+                        last = skb->data[count_put - 1];
                         len -= count_put;
 #ifdef CONFIG_ISDN_AUDIO
                 }
@@ -1903,6 +1913,11 @@ isdn_free_channel(int di, int ch, int usage)
 {
         int i;
 
+        if ((di < 0) || (ch < 0)) {
+                printk(KERN_WARNING "%s: called with invalid drv(%d) or channel(%d)\n",
+                        __FUNCTION__, di, ch);
+                return;
+        }
         for (i = 0; i < ISDN_MAX_CHANNELS; i++)
                 if (((!usage) || ((dev->usage[i] & ISDN_USAGE_MASK) == usage)) &&
                     (dev->drvmap[i] == di) &&
@@ -1918,7 +1933,8 @@ isdn_free_channel(int di, int ch, int usage)
                         dev->v110[i] = NULL;
 // 20.10.99 JIM, try to reinitialize v110 !
                         isdn_info_update();
-                        skb_queue_purge(&dev->drv[di]->rpqueue[ch]);
+                        if (dev->drv[di])
+                                skb_queue_purge(&dev->drv[di]->rpqueue[ch]);
                 }
 }
 
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 77579f82aede..0a53a990c100 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -82,7 +82,7 @@ isdn_tty_try_read(modem_info * info, struct sk_buff *skb)
                                                 int l = skb->len;
                                                 unsigned char *dp = skb->data;
                                                 while (--l) {
-                                                        if (*skb->data == DLE)
+                                                        if (*dp == DLE)
                                                                 tty_insert_flip_char(tty, DLE, 0);
                                                         tty_insert_flip_char(tty, *dp++, 0);
                                                 }
diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
index 743ac4077f35..8b3efc243161 100644
--- a/drivers/isdn/i4l/isdn_x25iface.c
+++ b/drivers/isdn/i4l/isdn_x25iface.c
@@ -208,7 +208,7 @@ static int isdn_x25iface_receive(struct concap_proto *cprot, struct sk_buff *skb
  */
 static int isdn_x25iface_connect_ind(struct concap_proto *cprot)
 {
-        struct sk_buff * skb = dev_alloc_skb(1);
+        struct sk_buff * skb;
         enum wan_states *state_p 
           = &( ( (ix25_pdata_t*) (cprot->proto_data) ) -> state);
         IX25DEBUG( "isdn_x25iface_connect_ind %s \n"
@@ -220,6 +220,8 @@ static int isdn_x25iface_connect_ind(struct concap_proto *cprot)
                 return -1;
         }
         *state_p = WAN_CONNECTED;
+
+        skb = dev_alloc_skb(1);
         if( skb ){
                 *( skb_put(skb, 1) ) = 0x01;
                 skb->protocol = x25_type_trans(skb, cprot->net_dev);