V4L/DVB (3569): PATCH: switch cpia2 to mutexes and use ioctl 32 compat lib func

[linux-2.6] / drivers / media / video / cpia_pp.c

diff --git a/drivers/media/video/cpia_pp.c b/drivers/media/video/cpia_pp.c
index 6861d408f1b3c98dc72de086c72c9d08d9621a53..74cff626e044375a467000ae57a64846af4d7e58 100644 (file)
--- a/drivers/media/video/cpia_pp.c
+++ b/drivers/media/video/cpia_pp.c
@@ -702,12 +702,11 @@ static int cpia_pp_register(struct parport *port)
                return -ENXIO;
        }
 
-       cam = kmalloc(sizeof(struct pp_cam_entry), GFP_KERNEL);
+       cam = kzalloc(sizeof(struct pp_cam_entry), GFP_KERNEL);
        if (cam == NULL) {
                LOG("failed to allocate camera structure\n");
                return -ENOMEM;
        }
-       memset(cam,0,sizeof(struct pp_cam_entry));
        
        pdev = parport_register_device(port, "cpia_pp", NULL, NULL,
                                       NULL, 0, cam);