diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-08 22:16:46 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 07:05:06 +0200 |
| commit | 2ed64eb9e7b4cf27055f78a7bd2ccf33a912d0cd (patch) | |
| tree | be2e88bf167c3015a1da9edac94ba863e8f5da6e /drivers/media/video/cpia_pp.c | |
| parent | V4L/DVB (4073): Support for new version of Satelco EasyWatch DVB-S light (diff) | |
| download | linux-2ed64eb9e7b4cf27055f78a7bd2ccf33a912d0cd.tar.xz linux-2ed64eb9e7b4cf27055f78a7bd2ccf33a912d0cd.zip | |
V4L/DVB (4086): There were a cross-reference on cpia and cpia_pp/cpia_usb
Those cross-references were generating an error:
*** Warning: "cpia_pp_init" [/home/v4l/master/v4l/cpia.ko] undefined!
*** Warning: "cpia_usb/_init" [/home/v4l/master/v4l/cpia.ko] undefined!
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cpia_pp.c')
| -rw-r--r-- | drivers/media/video/cpia_pp.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/video/cpia_pp.c b/drivers/media/video/cpia_pp.c index 0b00e6027dfb..4c89bd395d3e 100644 --- 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; } |