V4L/DVB (4197): Port new MPEG API to saa7134-empress with saa6752hs

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

diff --git a/drivers/media/video/cpia_pp.c b/drivers/media/video/cpia_pp.c
index 0b00e6027dfb302669a688f0167bc7a0bf8e1377..4c89bd395d3e6d275d78fda9580d16ed3a427d4a 100644 (file)
--- a/drivers/media/video/cpia_pp.c
+++ b/drivers/media/video/cpia_pp.c
@@ -803,7 +803,7 @@ static struct parport_driver cpia_pp_driver = {
        .detach = cpia_pp_detach,
 };
 
-int cpia_pp_init(void)
+static int cpia_pp_init(void)
 {
        printk(KERN_INFO "%s v%d.%d.%d\n",ABOUT,
               CPIA_PP_MAJ_VER,CPIA_PP_MIN_VER,CPIA_PP_PATCH_VER);
@@ -860,6 +860,8 @@ void cleanup_module(void)
 
 static int __init cpia_pp_setup(char *str)
 {
+       int err;
+
        if (!strncmp(str, "parport", 7)) {
                int n = simple_strtoul(str + 7, NULL, 10);
                if (parport_ptr < PARPORT_MAX) {
@@ -873,6 +875,10 @@ static int __init cpia_pp_setup(char *str)
                parport_nr[parport_ptr++] = PPCPIA_PARPORT_NONE;
        }
 
+       err=cpia_pp_init();
+       if (err)
+               return err;
+
        return 1;
 }