diff options
Diffstat (limited to 'drivers/media/video/cx18')
-rw-r--r-- | drivers/media/video/cx18/cx18-driver.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index 870c43e6e2f9..cbd4f85da76b 100644 --- a/drivers/media/video/cx18/cx18-driver.c +++ b/drivers/media/video/cx18/cx18-driver.c | |||
@@ -238,7 +238,8 @@ MODULE_PARM_DESC(enc_pcm_bufs, | |||
238 | "Number of encoder PCM buffers\n" | 238 | "Number of encoder PCM buffers\n" |
239 | "\t\t\tDefault is computed from other enc_pcm_* parameters"); | 239 | "\t\t\tDefault is computed from other enc_pcm_* parameters"); |
240 | 240 | ||
241 | MODULE_PARM_DESC(cx18_first_minor, "Set device node number assigned to first card"); | 241 | MODULE_PARM_DESC(cx18_first_minor, |
242 | "Set device node number assigned to first card"); | ||
242 | 243 | ||
243 | MODULE_AUTHOR("Hans Verkuil"); | 244 | MODULE_AUTHOR("Hans Verkuil"); |
244 | MODULE_DESCRIPTION("CX23418 driver"); | 245 | MODULE_DESCRIPTION("CX23418 driver"); |
@@ -1252,7 +1253,7 @@ static void cx18_remove(struct pci_dev *pci_dev) | |||
1252 | #if defined(CONFIG_MODULES) && defined(MODULE) | 1253 | #if defined(CONFIG_MODULES) && defined(MODULE) |
1253 | static void request_module_async(struct work_struct *work) | 1254 | static void request_module_async(struct work_struct *work) |
1254 | { | 1255 | { |
1255 | struct cx18 *dev=container_of(work, struct cx18, request_module_wk); | 1256 | struct cx18 *dev = container_of(work, struct cx18, request_module_wk); |
1256 | 1257 | ||
1257 | /* Make sure cx18-alsa module is loaded */ | 1258 | /* Make sure cx18-alsa module is loaded */ |
1258 | request_module("cx18-alsa"); | 1259 | request_module("cx18-alsa"); |
@@ -1281,7 +1282,8 @@ static struct pci_driver cx18_pci_driver = { | |||
1281 | 1282 | ||
1282 | static int __init module_start(void) | 1283 | static int __init module_start(void) |
1283 | { | 1284 | { |
1284 | printk(KERN_INFO "cx18: Start initialization, version %s\n", CX18_VERSION); | 1285 | printk(KERN_INFO "cx18: Start initialization, version %s\n", |
1286 | CX18_VERSION); | ||
1285 | 1287 | ||
1286 | /* Validate parameters */ | 1288 | /* Validate parameters */ |
1287 | if (cx18_first_minor < 0 || cx18_first_minor >= CX18_MAX_CARDS) { | 1289 | if (cx18_first_minor < 0 || cx18_first_minor >= CX18_MAX_CARDS) { |