Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / drivers / isdn / hysdn / hysdn_net.c

diff --git a/drivers/isdn/hysdn/hysdn_net.c b/drivers/isdn/hysdn/hysdn_net.c
index d205249a1242bb5d30fce1416bda6df69c2c3613..cfa8fa5e44ab5d1352eff43b3cc5407624ca80e1 100644 (file)
--- a/drivers/isdn/hysdn/hysdn_net.c
+++ b/drivers/isdn/hysdn/hysdn_net.c
@@ -214,8 +214,6 @@ hysdn_rx_netpkt(hysdn_card * card, unsigned char *buf, unsigned short len)
                lp->stats.rx_dropped++;
                return;
        }
-       skb->dev = &lp->netdev;
-
        /* copy the data */
        memcpy(skb_put(skb, len), buf, len);
 
@@ -278,11 +276,10 @@ hysdn_net_create(hysdn_card * card)
                return (-ENOMEM);
        }
        hysdn_net_release(card);        /* release an existing net device */
-       if ((dev = kmalloc(sizeof(struct net_local), GFP_KERNEL)) == NULL) {
+       if ((dev = kzalloc(sizeof(struct net_local), GFP_KERNEL)) == NULL) {
                printk(KERN_WARNING "HYSDN: unable to allocate mem\n");
                return (-ENOMEM);
        }
-       memset(dev, 0, sizeof(struct net_local));       /* clean the structure */
 
        spin_lock_init(&((struct net_local *) dev)->lock);