Merge branch 'locks' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / drivers / isdn / i4l / isdn_v110.c

diff --git a/drivers/isdn/i4l/isdn_v110.c b/drivers/isdn/i4l/isdn_v110.c
index 38619e8cd8230b4c9d893fbb85976a6a9055df2e..5484d3c38a5761b76ab888d146cab65719add51b 100644 (file)
--- a/drivers/isdn/i4l/isdn_v110.c
+++ b/drivers/isdn/i4l/isdn_v110.c
@@ -92,9 +92,8 @@ isdn_v110_open(unsigned char key, int hdrlen, int maxsize)
        int i;
        isdn_v110_stream *v;
 
-       if ((v = kmalloc(sizeof(isdn_v110_stream), GFP_ATOMIC)) == NULL)
+       if ((v = kzalloc(sizeof(isdn_v110_stream), GFP_ATOMIC)) == NULL)
                return NULL;
-       memset(v, 0, sizeof(isdn_v110_stream));
        v->key = key;
        v->nbits = 0;
        for (i = 0; key & (1 << i); i++)