Pull delete-sigdelayed into release branch

[linux-2.6-omap-h63xx.git] / drivers / media / video / zr36060.c

diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zr36060.c
index 129744a07abd868c47609ad23adda80c42f8e82e..d8dd003a7aadef1260da978e8f50f4c3e615ee3e 100644 (file)
--- a/drivers/media/video/zr36060.c
+++ b/drivers/media/video/zr36060.c
@@ -161,7 +161,7 @@ zr36060_wait_end (struct zr36060 *ptr)
 
        while (zr36060_read_status(ptr) & ZR060_CFSR_Busy) {
                udelay(1);
-               if (i++ > 200000) {     // 200ms, there is for shure something wrong!!!
+               if (i++ > 200000) {     // 200ms, there is for sure something wrong!!!
                        dprintk(1,
                                "%s: timout at wait_end (last status: 0x%02x)\n",
                                ptr->name, ptr->status);
@@ -919,12 +919,11 @@ zr36060_setup (struct videocodec *codec)
                return -ENOSPC;
        }
        //mem structure init
-       codec->data = ptr = kmalloc(sizeof(struct zr36060), GFP_KERNEL);
+       codec->data = ptr = kzalloc(sizeof(struct zr36060), GFP_KERNEL);
        if (NULL == ptr) {
                dprintk(1, KERN_ERR "zr36060: Can't get enough memory!\n");
                return -ENOMEM;
        }
-       memset(ptr, 0, sizeof(struct zr36060));
 
        snprintf(ptr->name, sizeof(ptr->name), "zr36060[%d]",
                 zr36060_codecs);