From e3cc48a55ad4ec62d5afddf8c75d49c2ca299e6f Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Sun, 20 Dec 2009 23:29:02 -0300 Subject: [PATCH] --- yaml --- r: 181566 b: refs/heads/master c: f8bd9d26c59d0df0335bf43191feb732f2c8b6ad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx18/cx18-driver.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c2c3c7dd4908..5426eb8a3c84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 780edb7ad60e5c657770f510747cc609c84b5b61 +refs/heads/master: f8bd9d26c59d0df0335bf43191feb732f2c8b6ad diff --git a/trunk/drivers/media/video/cx18/cx18-driver.c b/trunk/drivers/media/video/cx18/cx18-driver.c index 870c43e6e2f9..cbd4f85da76b 100644 --- a/trunk/drivers/media/video/cx18/cx18-driver.c +++ b/trunk/drivers/media/video/cx18/cx18-driver.c @@ -238,7 +238,8 @@ MODULE_PARM_DESC(enc_pcm_bufs, "Number of encoder PCM buffers\n" "\t\t\tDefault is computed from other enc_pcm_* parameters"); -MODULE_PARM_DESC(cx18_first_minor, "Set device node number assigned to first card"); +MODULE_PARM_DESC(cx18_first_minor, + "Set device node number assigned to first card"); MODULE_AUTHOR("Hans Verkuil"); MODULE_DESCRIPTION("CX23418 driver"); @@ -1252,7 +1253,7 @@ static void cx18_remove(struct pci_dev *pci_dev) #if defined(CONFIG_MODULES) && defined(MODULE) static void request_module_async(struct work_struct *work) { - struct cx18 *dev=container_of(work, struct cx18, request_module_wk); + struct cx18 *dev = container_of(work, struct cx18, request_module_wk); /* Make sure cx18-alsa module is loaded */ request_module("cx18-alsa"); @@ -1281,7 +1282,8 @@ static struct pci_driver cx18_pci_driver = { static int __init module_start(void) { - printk(KERN_INFO "cx18: Start initialization, version %s\n", CX18_VERSION); + printk(KERN_INFO "cx18: Start initialization, version %s\n", + CX18_VERSION); /* Validate parameters */ if (cx18_first_minor < 0 || cx18_first_minor >= CX18_MAX_CARDS) {