14 files changed, 108 insertions, 105 deletions

diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig
index acc4b47f1d1d..5f942690570c 100644
--- a/drivers/media/video/cx18/Kconfig
+++ b/drivers/media/video/cx18/Kconfig
@@ -1,14 +1,17 @@
 config VIDEO_CX18
         tristate "Conexant cx23418 MPEG encoder support"
         depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL
+        depends on INPUT        # due to VIDEO_IR
+        depends on HOTPLUG      # due to FW_LOADER
         select I2C_ALGOBIT
         select FW_LOADER
         select VIDEO_IR
-        select MEDIA_TUNER
+        select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_CX2341X
         select VIDEO_CS5345
         select DVB_S5H1409
+        select MEDIA_TUNER_MXL5005S
         ---help---
           This is a video4linux driver for Conexant cx23418 based
           PCI combo video recorder devices.
diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c
index f5e3ba1f5354..553adbf2cd44 100644
--- a/drivers/media/video/cx18/cx18-cards.c
+++ b/drivers/media/video/cx18/cx18-cards.c
@@ -47,11 +47,12 @@ static struct cx18_card_tuner_i2c cx18_i2c_std = {
 static const struct cx18_card cx18_card_hvr1600_esmt = {
         .type = CX18_CARD_HVR_1600_ESMT,
         .name = "Hauppauge HVR-1600",
-        .comment = "DVB & VBI are not yet supported\n",
+        .comment = "VBI is not yet supported\n",
         .v4l2_capabilities = CX18_CAP_ENCODER,
         .hw_audio_ctrl = CX18_HW_CX23418,
         .hw_muxer = CX18_HW_CS5345,
-        .hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER | CX18_HW_CS5345,
+        .hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER |
+                  CX18_HW_CS5345 | CX18_HW_DVB,
         .video_inputs = {
                 { CX18_CARD_INPUT_VID_TUNER,  0, CX23418_COMPOSITE7 },
                 { CX18_CARD_INPUT_SVIDEO1,    1, CX23418_SVIDEO1    },
@@ -86,11 +87,12 @@ static const struct cx18_card cx18_card_hvr1600_esmt = {
 static const struct cx18_card cx18_card_hvr1600_samsung = {
         .type = CX18_CARD_HVR_1600_SAMSUNG,
         .name = "Hauppauge HVR-1600 (Preproduction)",
-        .comment = "DVB & VBI are not yet supported\n",
+        .comment = "VBI is not yet supported\n",
         .v4l2_capabilities = CX18_CAP_ENCODER,
         .hw_audio_ctrl = CX18_HW_CX23418,
         .hw_muxer = CX18_HW_CS5345,
-        .hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER | CX18_HW_CS5345,
+        .hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER |
+                  CX18_HW_CS5345 | CX18_HW_DVB,
         .video_inputs = {
                 { CX18_CARD_INPUT_VID_TUNER,  0, CX23418_COMPOSITE7 },
                 { CX18_CARD_INPUT_SVIDEO1,    1, CX23418_SVIDEO1    },
@@ -134,14 +136,15 @@ static const struct cx18_card_pci_info cx18_pci_h900[] = {
 static const struct cx18_card cx18_card_h900 = {
         .type = CX18_CARD_COMPRO_H900,
         .name = "Compro VideoMate H900",
-        .comment = "Not yet supported!\n",
-        .v4l2_capabilities = 0,
+        .comment = "DVB & VBI are not yet supported\n",
+        .v4l2_capabilities = CX18_CAP_ENCODER,
         .hw_audio_ctrl = CX18_HW_CX23418,
         .hw_all = CX18_HW_TUNER,
         .video_inputs = {
-                { CX18_CARD_INPUT_VID_TUNER,  0, CX23418_COMPOSITE7 },
-                { CX18_CARD_INPUT_SVIDEO1,    1, CX23418_SVIDEO1    },
-                { CX18_CARD_INPUT_COMPOSITE1, 1, CX23418_COMPOSITE3 },
+                { CX18_CARD_INPUT_VID_TUNER,  0, CX23418_COMPOSITE2 },
+                { CX18_CARD_INPUT_SVIDEO1,    1,
+                        CX23418_SVIDEO_LUMA3 | CX23418_SVIDEO_CHROMA4 },
+                { CX18_CARD_INPUT_COMPOSITE1, 1, CX23418_COMPOSITE1 },
         },
         .audio_inputs = {
                 { CX18_CARD_INPUT_AUD_TUNER,
@@ -163,6 +166,7 @@ static const struct cx18_card cx18_card_h900 = {
                 .tune_lane = 0,
                 .initial_emrs = 0,
         },
+        .xceive_pin = 15,
         .pci_list = cx18_pci_h900,
         .i2c = &cx18_i2c_std,
 };
@@ -200,8 +204,6 @@ static const struct cx18_card cx18_card_mpc718 = {
                 /* XC3028 tuner */
                 { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
         },
-        /* tuner reset */
-        .gpio_init = { .direction = 0x1000, .initial_value = 0x1000 },
         .ddr = {
                 /* Probably Samsung K4D263238G-VC33 memory */
                 .chip_config = 0x003,
@@ -211,6 +213,7 @@ static const struct cx18_card cx18_card_mpc718 = {
                 .tune_lane = 0,
                 .initial_emrs = 2,
         },
+        .xceive_pin = 15,
         .pci_list = cx18_pci_mpc718,
         .i2c = &cx18_i2c_std,
 };
diff --git a/drivers/media/video/cx18/cx18-cards.h b/drivers/media/video/cx18/cx18-cards.h
index bca249bdd337..bccb67f0db16 100644
--- a/drivers/media/video/cx18/cx18-cards.h
+++ b/drivers/media/video/cx18/cx18-cards.h
@@ -114,8 +114,8 @@ struct cx18_card_pci_info {
 /* The mask is the set of bits used by the operation */
 
 struct cx18_gpio_init { /* set initial GPIO DIR and OUT values */
-        u16 direction;  /* DIR setting. Leave to 0 if no init is needed */
-        u16 initial_value;
+        u32 direction;  /* DIR setting. Leave to 0 if no init is needed */
+        u32 initial_value;
 };
 
 struct cx18_card_tuner {
@@ -153,6 +153,7 @@ struct cx18_card {
         struct cx18_card_audio_input radio_input;
 
         /* GPIO card-specific settings */
+        u8 xceive_pin;          /* XCeive tuner GPIO reset pin */
         struct cx18_gpio_init           gpio_init;
 
         struct cx18_card_tuner tuners[CX18_CARD_MAX_TUNERS];
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 8f5ed9b4bf83..0dd4e0529970 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -164,16 +164,6 @@ MODULE_LICENSE("GPL");
 
 MODULE_VERSION(CX18_VERSION);
 
-int cx18_waitq(wait_queue_head_t *waitq)
-{
-        DEFINE_WAIT(wait);
-
-        prepare_to_wait(waitq, &wait, TASK_INTERRUPTIBLE);
-        schedule();
-        finish_wait(waitq, &wait);
-        return signal_pending(current) ? -EINTR : 0;
-}
-
 /* Generic utility functions */
 int cx18_msleep_timeout(unsigned int msecs, int intr)
 {
@@ -220,13 +210,13 @@ static void cx18_process_eeprom(struct cx18 *cx)
 
         /* Many thanks to Steven Toth from Hauppauge for providing the
            model numbers */
+        /* Note: the Samsung memory models cannot be reliably determined
+           from the model number. Use the cardtype module option if you
+           have one of these preproduction models. */
         switch (tv.model) {
-        case 74000 ... 74099:
+        case 74000 ... 74999:
                 cx->card = cx18_get_card(CX18_CARD_HVR_1600_ESMT);
                 break;
-        case 74700 ... 74799:
-                cx->card = cx18_get_card(CX18_CARD_HVR_1600_SAMSUNG);
-                break;
         case 0:
                 CX18_ERR("Invalid EEPROM\n");
                 return;
@@ -548,6 +538,7 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *dev,
         return 0;
 }
 
+#ifdef MODULE
 static u32 cx18_request_module(struct cx18 *cx, u32 hw,
                 const char *name, u32 id)
 {
@@ -560,12 +551,14 @@ static u32 cx18_request_module(struct cx18 *cx, u32 hw,
         CX18_DEBUG_INFO("Loaded module %s\n", name);
         return hw;
 }
+#endif
 
 static void cx18_load_and_init_modules(struct cx18 *cx)
 {
         u32 hw = cx->card->hw_all;
         int i;
 
+#ifdef MODULE
         /* load modules */
 #ifndef CONFIG_MEDIA_TUNER
         hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER);
@@ -573,6 +566,7 @@ static void cx18_load_and_init_modules(struct cx18 *cx)
 #ifndef CONFIG_VIDEO_CS5345
         hw = cx18_request_module(cx, hw, "cs5345", CX18_HW_CS5345);
 #endif
+#endif
 
         /* check which i2c devices are actually found */
         for (i = 0; i < 32; i++) {
@@ -613,7 +607,7 @@ static int __devinit cx18_probe(struct pci_dev *dev,
         }
 
         cx = kzalloc(sizeof(struct cx18), GFP_ATOMIC);
-        if (cx == 0) {
+        if (!cx) {
                 spin_unlock(&cx18_cards_lock);
                 return -ENOMEM;
         }
@@ -801,7 +795,7 @@ static int __devinit cx18_probe(struct pci_dev *dev,
         return 0;
 
 free_streams:
-        cx18_streams_cleanup(cx);
+        cx18_streams_cleanup(cx, 1);
 free_irq:
         free_irq(cx->dev->irq, (void *)cx);
 free_i2c:
@@ -904,14 +898,13 @@ static void cx18_remove(struct pci_dev *pci_dev)
 
         cx18_halt_firmware(cx);
 
-        cx18_streams_cleanup(cx);
+        cx18_streams_cleanup(cx, 1);
 
         exit_cx18_i2c(cx);
 
         free_irq(cx->dev->irq, (void *)cx);
 
-        if (cx->dev)
-                cx18_iounmap(cx);
+        cx18_iounmap(cx);
 
         release_mem_region(cx->base_addr, CX18_MEM_SIZE);
 
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 2ee939193bb7..a2a6c58d12fe 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -444,9 +444,6 @@ extern spinlock_t cx18_cards_lock;
 /* Return non-zero if a signal is pending */
 int cx18_msleep_timeout(unsigned int msecs, int intr);
 
-/* Wait on queue, returns -EINTR if interrupted */
-int cx18_waitq(wait_queue_head_t *waitq);
-
 /* Read Hauppauge eeprom */
 struct tveeprom; /* forward reference */
 void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv);
diff --git a/drivers/media/video/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c
index 65efe69d939a..c9744173f969 100644
--- a/drivers/media/video/cx18/cx18-dvb.c
+++ b/drivers/media/video/cx18/cx18-dvb.c
@@ -24,25 +24,27 @@
 #include "cx18-streams.h"
 #include "cx18-cards.h"
 #include "s5h1409.h"
-
-/* Wait until the MXL500X driver is merged */
-#ifdef HAVE_MXL500X
-#include "mxl500x.h"
-#endif
+#include "mxl5005s.h"
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 #define CX18_REG_DMUX_NUM_PORT_0_CONTROL 0xd5a000
 
-#ifdef HAVE_MXL500X
-static struct mxl500x_config hauppauge_hvr1600_tuner = {
-        .delsys    = MXL500x_MODE_ATSC,
-        .octf      = MXL500x_OCTF_CH,
-        .xtal_freq = 16000000,
-        .iflo_freq = 5380000,
-        .ref_freq  = 322800000,
-        .rssi_ena  = MXL_RSSI_ENABLE,
-        .addr      = 0xC6 >> 1,
+static struct mxl5005s_config hauppauge_hvr1600_tuner = {
+        .i2c_address     = 0xC6 >> 1,
+        .if_freq         = IF_FREQ_5380000HZ,
+        .xtal_freq       = CRYSTAL_FREQ_16000000HZ,
+        .agc_mode        = MXL_SINGLE_AGC,
+        .tracking_filter = MXL_TF_C_H,
+        .rssi_enable     = MXL_RSSI_ENABLE,
+        .cap_select      = MXL_CAP_SEL_ENABLE,
+        .div_out         = MXL_DIV_OUT_4,
+        .clock_out       = MXL_CLOCK_OUT_DISABLE,
+        .output_load     = MXL5005S_IF_OUTPUT_LOAD_200_OHM,
+        .top             = MXL5005S_TOP_25P2,
+        .mod_mode        = MXL_DIGITAL_MODE,
+        .if_mode         = MXL_ZERO_IF,
+        .AgcMasterByte   = 0x00,
 };
 
 static struct s5h1409_config hauppauge_hvr1600_config = {
@@ -55,7 +57,6 @@ static struct s5h1409_config hauppauge_hvr1600_config = {
         .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK
 
 };
-#endif
 
 static int dvb_register(struct cx18_stream *stream);
 
@@ -252,21 +253,18 @@ static int dvb_register(struct cx18_stream *stream)
         int ret = 0;
 
         switch (cx->card->type) {
-/* Wait until the MXL500X driver is merged */
-#ifdef HAVE_MXL500X
         case CX18_CARD_HVR_1600_ESMT:
         case CX18_CARD_HVR_1600_SAMSUNG:
                 dvb->fe = dvb_attach(s5h1409_attach,
                         &hauppauge_hvr1600_config,
                         &cx->i2c_adap[0]);
                 if (dvb->fe != NULL) {
-                        dvb_attach(mxl500x_attach, dvb->fe,
-                                &hauppauge_hvr1600_tuner,
-                                &cx->i2c_adap[0]);
+                        dvb_attach(mxl5005s_attach, dvb->fe,
+                                &cx->i2c_adap[0],
+                                &hauppauge_hvr1600_tuner);
                         ret = 0;
                 }
                 break;
-#endif
         default:
                 /* No Digital Tv Support */
                 break;
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c
index 69303065a294..0b3141db174b 100644
--- a/drivers/media/video/cx18/cx18-fileops.c
+++ b/drivers/media/video/cx18/cx18-fileops.c
@@ -39,7 +39,7 @@
    associated VBI streams are also automatically claimed.
    Possible error returns: -EBUSY if someone else has claimed
    the stream or 0 on success. */
-int cx18_claim_stream(struct cx18_open_id *id, int type)
+static int cx18_claim_stream(struct cx18_open_id *id, int type)
 {
         struct cx18 *cx = id->cx;
         struct cx18_stream *s = &cx->streams[type];
@@ -87,7 +87,7 @@ int cx18_claim_stream(struct cx18_open_id *id, int type)
 
 /* This function releases a previously claimed stream. It will take into
    account associated VBI streams. */
-void cx18_release_stream(struct cx18_stream *s)
+static void cx18_release_stream(struct cx18_stream *s)
 {
         struct cx18 *cx = s->cx;
         struct cx18_stream *s_vbi;
@@ -662,6 +662,8 @@ int cx18_v4l2_open(struct inode *inode, struct file *filp)
         for (x = 0; cx == NULL && x < cx18_cards_active; x++) {
                 /* find out which stream this open was on */
                 for (y = 0; y < CX18_MAX_STREAMS; y++) {
+                        if (cx18_cards[x] == NULL)
+                                continue;
                         s = &cx18_cards[x]->streams[y];
                         if (s->v4l2dev && s->v4l2dev->minor == minor) {
                                 cx = cx18_cards[x];
diff --git a/drivers/media/video/cx18/cx18-fileops.h b/drivers/media/video/cx18/cx18-fileops.h
index 16cdafbd24c5..46da0282fc7d 100644
--- a/drivers/media/video/cx18/cx18-fileops.h
+++ b/drivers/media/video/cx18/cx18-fileops.h
@@ -34,12 +34,3 @@ void cx18_stop_capture(struct cx18_open_id *id, int gop_end);
 void cx18_mute(struct cx18 *cx);
 void cx18_unmute(struct cx18 *cx);
 
-/* Utilities */
-
-/* Try to claim a stream for the filehandle. Return 0 on success,
-   -EBUSY if stream already claimed. Once a stream is claimed, it
-   remains claimed until the associated filehandle is closed. */
-int cx18_claim_stream(struct cx18_open_id *id, int type);
-
-/* Release a previously claimed stream. */
-void cx18_release_stream(struct cx18_stream *s);
diff --git a/drivers/media/video/cx18/cx18-gpio.c b/drivers/media/video/cx18/cx18-gpio.c
index 19253e6b8673..bb8bc86086d0 100644
--- a/drivers/media/video/cx18/cx18-gpio.c
+++ b/drivers/media/video/cx18/cx18-gpio.c
@@ -35,6 +35,9 @@
 #define CX18_REG_GPIO_OUT2   0xc78104
 #define CX18_REG_GPIO_DIR2   0xc7810c
 
+static u32 gpio_dir;
+static u32 gpio_val;
+
 /*
  * HVR-1600 GPIO pins, courtesy of Hauppauge:
  *
@@ -44,31 +47,53 @@
  * gpio13: cs5345 reset pin
 */
 
+static void gpio_write(struct cx18 *cx)
+{
+        write_reg((gpio_dir & 0xffff) << 16, CX18_REG_GPIO_DIR1);
+        write_reg(((gpio_dir & 0xffff) << 16) | (gpio_val & 0xffff),
+                        CX18_REG_GPIO_OUT1);
+        write_reg(gpio_dir & 0xffff0000, CX18_REG_GPIO_DIR2);
+        write_reg((gpio_dir & 0xffff0000) | ((gpio_val & 0xffff0000) >> 16),
+                        CX18_REG_GPIO_OUT2);
+}
+
 void cx18_gpio_init(struct cx18 *cx)
 {
-        if (cx->card->gpio_init.direction == 0)
+        gpio_dir = cx->card->gpio_init.direction;
+        gpio_val = cx->card->gpio_init.initial_value;
+
+        if (gpio_dir == 0)
                 return;
 
-        CX18_DEBUG_INFO("GPIO initial dir: %08x out: %08x\n",
-                   read_reg(CX18_REG_GPIO_DIR1), read_reg(CX18_REG_GPIO_OUT1));
+        gpio_dir |= 1 << cx->card->xceive_pin;
+        gpio_val |= 1 << cx->card->xceive_pin;
 
-        /* init output data then direction */
-        write_reg(cx->card->gpio_init.direction << 16, CX18_REG_GPIO_DIR1);
-        write_reg(0, CX18_REG_GPIO_DIR2);
-        write_reg((cx->card->gpio_init.direction << 16) |
-                        cx->card->gpio_init.initial_value, CX18_REG_GPIO_OUT1);
-        write_reg(0, CX18_REG_GPIO_OUT2);
+        CX18_DEBUG_INFO("GPIO initial dir: %08x/%08x out: %08x/%08x\n",
+                   read_reg(CX18_REG_GPIO_DIR1), read_reg(CX18_REG_GPIO_DIR2),
+                   read_reg(CX18_REG_GPIO_OUT1), read_reg(CX18_REG_GPIO_OUT2));
+
+        gpio_write(cx);
 }
 
 /* Xceive tuner reset function */
 int cx18_reset_tuner_gpio(void *dev, int cmd, int value)
 {
         struct i2c_algo_bit_data *algo = dev;
-        struct cx18 *cx = algo->data;
-/*      int curdir, curout;*/
+        struct cx18_i2c_algo_callback_data *cb_data = algo->data;
+        struct cx18 *cx = cb_data->cx;
 
         if (cmd != XC2028_TUNER_RESET)
                 return 0;
         CX18_DEBUG_INFO("Resetting tuner\n");
+
+        gpio_dir |= 1 << cx->card->xceive_pin;
+        gpio_val &= ~(1 << cx->card->xceive_pin);
+
+        gpio_write(cx);
+        schedule_timeout_interruptible(msecs_to_jiffies(1));
+
+        gpio_val |= 1 << cx->card->xceive_pin;
+        gpio_write(cx);
+        schedule_timeout_interruptible(msecs_to_jiffies(1));
         return 0;
 }
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c
index 18c88d1e4833..4f08a4058d1a 100644
--- a/drivers/media/video/cx18/cx18-i2c.c
+++ b/drivers/media/video/cx18/cx18-i2c.c
@@ -25,6 +25,7 @@
 #include "cx18-cards.h"
 #include "cx18-gpio.h"
 #include "cx18-av-core.h"
+#include "cx18-i2c.h"
 
 #include <media/ir-kbd-i2c.h>
 
diff --git a/drivers/media/video/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c
index 65af1bb507ca..6990b77c6200 100644
--- a/drivers/media/video/cx18/cx18-queue.c
+++ b/drivers/media/video/cx18/cx18-queue.c
@@ -26,17 +26,6 @@
 #include "cx18-queue.h"
 #include "cx18-scb.h"
 
-int cx18_buf_copy_from_user(struct cx18_stream *s, struct cx18_buffer *buf,
-                const char __user *src, int copybytes)
-{
-        if (s->buf_size - buf->bytesused < copybytes)
-                copybytes = s->buf_size - buf->bytesused;
-        if (copy_from_user(buf->buf + buf->bytesused, src, copybytes))
-                return -EFAULT;
-        buf->bytesused += copybytes;
-        return copybytes;
-}
-
 void cx18_buf_swap(struct cx18_buffer *buf)
 {
         int i;
@@ -159,8 +148,9 @@ static void cx18_queue_move_buf(struct cx18_stream *s, struct cx18_queue *from,
    -ENOMEM is returned if the buffers could not be obtained, 0 if all
    buffers where obtained from the 'from' list and if non-zero then
    the number of stolen buffers is returned. */
-int cx18_queue_move(struct cx18_stream *s, struct cx18_queue *from,
-        struct cx18_queue *steal, struct cx18_queue *to, int needed_bytes)
+static int cx18_queue_move(struct cx18_stream *s, struct cx18_queue *from,
+                           struct cx18_queue *steal, struct cx18_queue *to,
+                           int needed_bytes)
 {
         unsigned long flags;
         int rc = 0;
@@ -239,12 +229,12 @@ int cx18_stream_alloc(struct cx18_stream *s)
 
         /* allocate stream buffers. Initially all buffers are in q_free. */
         for (i = 0; i < s->buffers; i++) {
-                struct cx18_buffer *buf =
-                        kzalloc(sizeof(struct cx18_buffer), GFP_KERNEL);
+                struct cx18_buffer *buf = kzalloc(sizeof(struct cx18_buffer),
+                                                GFP_KERNEL|__GFP_NOWARN);
 
                 if (buf == NULL)
                         break;
-                buf->buf = kmalloc(s->buf_size, GFP_KERNEL);
+                buf->buf = kmalloc(s->buf_size, GFP_KERNEL|__GFP_NOWARN);
                 if (buf->buf == NULL) {
                         kfree(buf);
                         break;
diff --git a/drivers/media/video/cx18/cx18-queue.h b/drivers/media/video/cx18/cx18-queue.h
index f86c8a6fa6e7..91423b9863a4 100644
--- a/drivers/media/video/cx18/cx18-queue.h
+++ b/drivers/media/video/cx18/cx18-queue.h
@@ -39,8 +39,6 @@ static inline void cx18_buf_sync_for_device(struct cx18_stream *s,
                                 s->buf_size, s->dma);
 }
 
-int cx18_buf_copy_from_user(struct cx18_stream *s, struct cx18_buffer *buf,
-        const char __user *src, int copybytes);
 void cx18_buf_swap(struct cx18_buffer *buf);
 
 /* cx18_queue utility functions */
@@ -48,8 +46,6 @@ void cx18_queue_init(struct cx18_queue *q);
 void cx18_enqueue(struct cx18_stream *s, struct cx18_buffer *buf,
         struct cx18_queue *q);
 struct cx18_buffer *cx18_dequeue(struct cx18_stream *s, struct cx18_queue *q);
-int cx18_queue_move(struct cx18_stream *s, struct cx18_queue *from,
-       struct cx18_queue *steal, struct cx18_queue *to, int needed_bytes);
 struct cx18_buffer *cx18_queue_find_buf(struct cx18_stream *s, u32 id,
         u32 bytesused);
 void cx18_flush_queues(struct cx18_stream *s);
diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c
index afb141b2027a..4ca9d847f1b1 100644
--- a/drivers/media/video/cx18/cx18-streams.c
+++ b/drivers/media/video/cx18/cx18-streams.c
@@ -218,7 +218,7 @@ int cx18_streams_setup(struct cx18 *cx)
                 return 0;
 
         /* One or more streams could not be initialized. Clean 'em all up. */
-        cx18_streams_cleanup(cx);
+        cx18_streams_cleanup(cx, 0);
         return -ENOMEM;
 }
 
@@ -296,12 +296,12 @@ int cx18_streams_register(struct cx18 *cx)
                 return 0;
 
         /* One or more streams could not be initialized. Clean 'em all up. */
-        cx18_streams_cleanup(cx);
+        cx18_streams_cleanup(cx, 1);
         return -ENOMEM;
 }
 
 /* Unregister v4l2 devices */
-void cx18_streams_cleanup(struct cx18 *cx)
+void cx18_streams_cleanup(struct cx18 *cx, int unregister)
 {
         struct video_device *vdev;
         int type;
@@ -319,8 +319,11 @@ void cx18_streams_cleanup(struct cx18 *cx)
 
                 cx18_stream_free(&cx->streams[type]);
 
-                /* Unregister device */
-                video_unregister_device(vdev);
+                /* Unregister or release device */
+                if (unregister)
+                        video_unregister_device(vdev);
+                else
+                        video_device_release(vdev);
         }
 }
 
diff --git a/drivers/media/video/cx18/cx18-streams.h b/drivers/media/video/cx18/cx18-streams.h
index 8c7ba7d2fa79..f327e947b24f 100644
--- a/drivers/media/video/cx18/cx18-streams.h
+++ b/drivers/media/video/cx18/cx18-streams.h
@@ -24,7 +24,7 @@
 u32 cx18_find_handle(struct cx18 *cx);
 int cx18_streams_setup(struct cx18 *cx);
 int cx18_streams_register(struct cx18 *cx);
-void cx18_streams_cleanup(struct cx18 *cx);
+void cx18_streams_cleanup(struct cx18 *cx, int unregister);
 
 /* Capture related */
 int cx18_start_v4l2_encode_stream(struct cx18_stream *s);