fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / isdn / hardware / avm / b1.c

diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
index c87516a..7a69a18 100644 (file)
--- a/drivers/isdn/hardware/avm/b1.c
+++ b/drivers/isdn/hardware/avm/b1.c
@@ -65,18 +65,15 @@ avmcard *b1_alloc_card(int nr_controllers)
        avmctrl_info *cinfo;
        int i;
 
-       card = kmalloc(sizeof(*card), GFP_KERNEL);
+       card = kzalloc(sizeof(*card), GFP_KERNEL);
        if (!card)
                return NULL;
 
-       memset(card, 0, sizeof(*card));
-
-        cinfo = kmalloc(sizeof(*cinfo) * nr_controllers, GFP_KERNEL);
+       cinfo = kzalloc(sizeof(*cinfo) * nr_controllers, GFP_KERNEL);
        if (!cinfo) {
                kfree(card);
                return NULL;
        }
-       memset(cinfo, 0, sizeof(*cinfo) * nr_controllers);
 
        card->ctrlinfo = cinfo;
        for (i = 0; i < nr_controllers; i++) {
@@ -389,7 +386,7 @@ u16 b1_send_message(struct capi_ctr *ctrl, struct sk_buff *skb)
                                             CAPIMSG_NCCI(skb->data),
                                             CAPIMSG_MSGID(skb->data));
                if (retval != CAPI_NOERROR) 
-                       goto out;
+                       return retval;
 
                dlen = CAPIMSG_DATALEN(skb->data);
 
@@ -399,16 +396,14 @@ u16 b1_send_message(struct capi_ctr *ctrl, struct sk_buff *skb)
                b1_put_slice(port, skb->data + len, dlen);
                spin_unlock_irqrestore(&card->lock, flags);
        } else {
-               retval = CAPI_NOERROR;
-
                spin_lock_irqsave(&card->lock, flags);
                b1_put_byte(port, SEND_MESSAGE);
                b1_put_slice(port, skb->data, len);
                spin_unlock_irqrestore(&card->lock, flags);
        }
- out:
+
        dev_kfree_skb_any(skb);
-       return retval;
+       return CAPI_NOERROR;
 }
 
 /* ------------------------------------------------------------- */
@@ -487,7 +482,7 @@ void b1_parse_version(avmctrl_info *cinfo)
 
 /* ------------------------------------------------------------- */
 
-irqreturn_t b1_interrupt(int interrupt, void *devptr, struct pt_regs *regs)
+irqreturn_t b1_interrupt(int interrupt, void *devptr)
 {
        avmcard *card = devptr;
        avmctrl_info *cinfo = &card->ctrlinfo[0];
@@ -720,12 +715,11 @@ avmcard_dma_alloc(char *name, struct pci_dev *pdev, long rsize, long ssize)
        avmcard_dmainfo *p;
        void *buf;
 
-       p = kmalloc(sizeof(avmcard_dmainfo), GFP_KERNEL);
+       p = kzalloc(sizeof(avmcard_dmainfo), GFP_KERNEL);
        if (!p) {
                printk(KERN_WARNING "%s: no memory.\n", name);
                goto err;
        }
-       memset(p, 0, sizeof(avmcard_dmainfo));
 
        p->recvbuf.size = rsize;
        buf = pci_alloc_consistent(pdev, rsize, &p->recvbuf.dmaaddr);