]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/media/video/em28xx/em28xx-video.c
V4L/DVB (7617): Removes a manual mode setup
[karo-tx-linux.git] / drivers / media / video / em28xx / em28xx-video.c
index c2901f13eb2583eada0a99ebb8696305e8a0651e..8996175cc95075bca9c42c89501a2adc51bd12fc 100644 (file)
@@ -1,5 +1,6 @@
 /*
-   em28xx-video.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
+   em28xx-video.c - driver for Empia EM2800/EM2820/2840 USB
+                   video capture devices
 
    Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
                      Markus Rechberger <mrechberger@gmail.com>
@@ -38,6 +39,7 @@
 #include "em28xx.h"
 #include <media/v4l2-common.h>
 #include <media/msp3400.h>
+#include <media/tuner.h>
 
 #define DRIVER_AUTHOR "Ludovico Cavedon <cavedon@sssup.it>, " \
                      "Markus Rechberger <mrechberger@gmail.com>, " \
 #define em28xx_videodbg(fmt, arg...) do {\
        if (video_debug) \
                printk(KERN_INFO "%s %s :"fmt, \
-                        dev->name, __FUNCTION__ , ##arg); } while (0)
+                        dev->name, __func__ , ##arg); } while (0)
+
+static unsigned int isoc_debug;
+module_param(isoc_debug, int, 0644);
+MODULE_PARM_DESC(isoc_debug, "enable debug messages [isoc transfers]");
+
+#define em28xx_isocdbg(fmt, arg...) \
+do {\
+       if (isoc_debug) { \
+               printk(KERN_INFO "%s %s :"fmt, \
+                        dev->name, __func__ , ##arg); \
+       } \
+  } while (0)
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
@@ -61,17 +75,21 @@ static LIST_HEAD(em28xx_devlist);
 
 static unsigned int card[]     = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
 static unsigned int video_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
-static unsigned int vbi_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
+static unsigned int vbi_nr[]   = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
+static unsigned int radio_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
+
 module_param_array(card,  int, NULL, 0444);
 module_param_array(video_nr, int, NULL, 0444);
 module_param_array(vbi_nr, int, NULL, 0444);
-MODULE_PARM_DESC(card,"card type");
-MODULE_PARM_DESC(video_nr,"video device numbers");
-MODULE_PARM_DESC(vbi_nr,"vbi device numbers");
+module_param_array(radio_nr, int, NULL, 0444);
+MODULE_PARM_DESC(card,     "card type");
+MODULE_PARM_DESC(video_nr, "video device numbers");
+MODULE_PARM_DESC(vbi_nr,   "vbi device numbers");
+MODULE_PARM_DESC(radio_nr, "radio device numbers");
 
-static unsigned int video_debug = 0;
-module_param(video_debug,int,0644);
-MODULE_PARM_DESC(video_debug,"enable debug messages [video]");
+static unsigned int video_debug;
+module_param(video_debug, int, 0644);
+MODULE_PARM_DESC(video_debug, "enable debug messages [video]");
 
 /* Bitmask marking allocated devices from 0 to EM28XX_MAXBOARDS */
 static unsigned long em28xx_devused;
@@ -88,7 +106,7 @@ static struct v4l2_queryctrl em28xx_qctrl[] = {
                .step = 0x1,
                .default_value = 0x1f,
                .flags = 0,
-       },{
+       }, {
                .id = V4L2_CID_AUDIO_MUTE,
                .type = V4L2_CTRL_TYPE_BOOLEAN,
                .name = "Mute",
@@ -102,8 +120,391 @@ static struct v4l2_queryctrl em28xx_qctrl[] = {
 
 static struct usb_driver em28xx_usb_driver;
 
+/* ------------------------------------------------------------------
+       DMA and thread functions
+   ------------------------------------------------------------------*/
+
+/*
+ * Announces that a buffer were filled and request the next
+ */
+static inline void buffer_filled(struct em28xx *dev,
+                                 struct em28xx_dmaqueue *dma_q,
+                                 struct em28xx_buffer *buf)
+{
+       /* Advice that buffer was filled */
+       em28xx_isocdbg("[%p/%d] wakeup\n", buf, buf->vb.i);
+       buf->vb.state = VIDEOBUF_DONE;
+       buf->vb.field_count++;
+       do_gettimeofday(&buf->vb.ts);
+
+       dev->isoc_ctl.buf = NULL;
+
+       list_del(&buf->vb.queue);
+       wake_up(&buf->vb.done);
+}
+
+/*
+ * Identify the buffer header type and properly handles
+ */
+static void em28xx_copy_video(struct em28xx *dev,
+                             struct em28xx_dmaqueue  *dma_q,
+                             struct em28xx_buffer *buf,
+                             unsigned char *p,
+                             unsigned char *outp, unsigned long len)
+{
+       void *fieldstart, *startwrite, *startread;
+       int  linesdone, currlinedone, offset, lencopy, remain;
+       int bytesperline = dev->width << 1;
+
+       if (dma_q->pos + len > buf->vb.size)
+               len = buf->vb.size - dma_q->pos;
+
+       if (p[0] != 0x88 && p[0] != 0x22) {
+               em28xx_isocdbg("frame is not complete\n");
+               len += 4;
+       } else
+               p += 4;
+
+       startread = p;
+       remain = len;
+
+       /* Interlaces frame */
+       if (buf->top_field)
+               fieldstart = outp;
+       else
+               fieldstart = outp + bytesperline;
+
+       linesdone = dma_q->pos / bytesperline;
+       currlinedone = dma_q->pos % bytesperline;
+       offset = linesdone * bytesperline * 2 + currlinedone;
+       startwrite = fieldstart + offset;
+       lencopy = bytesperline - currlinedone;
+       lencopy = lencopy > remain ? remain : lencopy;
+
+       if ((char *)startwrite + lencopy > (char *)outp + buf->vb.size) {
+               em28xx_isocdbg("Overflow of %zi bytes past buffer end (1)\n",
+                              ((char *)startwrite + lencopy) -
+                              ((char *)outp + buf->vb.size));
+               lencopy = remain = (char *)outp + buf->vb.size - (char *)startwrite;
+       }
+       if (lencopy <= 0)
+               return;
+       memcpy(startwrite, startread, lencopy);
+
+       remain -= lencopy;
+
+       while (remain > 0) {
+               startwrite += lencopy + bytesperline;
+               startread += lencopy;
+               if (bytesperline > remain)
+                       lencopy = remain;
+               else
+                       lencopy = bytesperline;
+
+               if ((char *)startwrite + lencopy > (char *)outp + buf->vb.size) {
+                       em28xx_isocdbg("Overflow of %zi bytes past buffer end (2)\n",
+                                      ((char *)startwrite + lencopy) -
+                                      ((char *)outp + buf->vb.size));
+                       lencopy = remain = (char *)outp + buf->vb.size -
+                                          (char *)startwrite;
+               }
+               if (lencopy <= 0)
+                       break;
+
+               memcpy(startwrite, startread, lencopy);
+
+               remain -= lencopy;
+       }
+
+       dma_q->pos += len;
+}
+
+static inline void print_err_status(struct em28xx *dev,
+                                    int packet, int status)
+{
+       char *errmsg = "Unknown";
+
+       switch (status) {
+       case -ENOENT:
+               errmsg = "unlinked synchronuously";
+               break;
+       case -ECONNRESET:
+               errmsg = "unlinked asynchronuously";
+               break;
+       case -ENOSR:
+               errmsg = "Buffer error (overrun)";
+               break;
+       case -EPIPE:
+               errmsg = "Stalled (device not responding)";
+               break;
+       case -EOVERFLOW:
+               errmsg = "Babble (bad cable?)";
+               break;
+       case -EPROTO:
+               errmsg = "Bit-stuff error (bad cable?)";
+               break;
+       case -EILSEQ:
+               errmsg = "CRC/Timeout (could be anything)";
+               break;
+       case -ETIME:
+               errmsg = "Device does not respond";
+               break;
+       }
+       if (packet < 0) {
+               em28xx_isocdbg("URB status %d [%s].\n", status, errmsg);
+       } else {
+               em28xx_isocdbg("URB packet %d, status %d [%s].\n",
+                              packet, status, errmsg);
+       }
+}
+
+/*
+ * video-buf generic routine to get the next available buffer
+ */
+static inline void get_next_buf(struct em28xx_dmaqueue *dma_q,
+                                         struct em28xx_buffer **buf)
+{
+       struct em28xx *dev = container_of(dma_q, struct em28xx, vidq);
+       char *outp;
+
+       if (list_empty(&dma_q->active)) {
+               em28xx_isocdbg("No active queue to serve\n");
+               dev->isoc_ctl.buf = NULL;
+               *buf = NULL;
+               return;
+       }
+
+       /* Get the next buffer */
+       *buf = list_entry(dma_q->active.next, struct em28xx_buffer, vb.queue);
+
+       /* Cleans up buffer - Usefull for testing for frame/URB loss */
+       outp = videobuf_to_vmalloc(&(*buf)->vb);
+       memset(outp, 0, (*buf)->vb.size);
+
+       dev->isoc_ctl.buf = *buf;
+
+       return;
+}
+
+/*
+ * Controls the isoc copy of each urb packet
+ */
+static inline int em28xx_isoc_copy(struct em28xx *dev, struct urb *urb)
+{
+       struct em28xx_buffer    *buf;
+       struct em28xx_dmaqueue  *dma_q = urb->context;
+       unsigned char *outp = NULL;
+       int i, len = 0, rc = 1;
+       unsigned char *p;
+
+       if (!dev)
+               return 0;
+
+       if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED))
+               return 0;
+
+       if (urb->status < 0) {
+               print_err_status(dev, -1, urb->status);
+               if (urb->status == -ENOENT)
+                       return 0;
+       }
+
+       buf = dev->isoc_ctl.buf;
+       if (buf != NULL)
+               outp = videobuf_to_vmalloc(&buf->vb);
+
+       for (i = 0; i < urb->number_of_packets; i++) {
+               int status = urb->iso_frame_desc[i].status;
+
+               if (status < 0) {
+                       print_err_status(dev, i, status);
+                       if (urb->iso_frame_desc[i].status != -EPROTO)
+                               continue;
+               }
+
+               len = urb->iso_frame_desc[i].actual_length - 4;
+
+               if (urb->iso_frame_desc[i].actual_length <= 0) {
+                       /* em28xx_isocdbg("packet %d is empty",i); - spammy */
+                       continue;
+               }
+               if (urb->iso_frame_desc[i].actual_length >
+                                               dev->max_pkt_size) {
+                       em28xx_isocdbg("packet bigger than packet size");
+                       continue;
+               }
+
+               p = urb->transfer_buffer + urb->iso_frame_desc[i].offset;
+
+               /* FIXME: incomplete buffer checks where removed to make
+                  logic simpler. Impacts of those changes should be evaluated
+                */
+               if (p[0] == 0x33 && p[1] == 0x95 && p[2] == 0x00) {
+                       em28xx_isocdbg("VBI HEADER!!!\n");
+                       /* FIXME: Should add vbi copy */
+                       continue;
+               }
+               if (p[0] == 0x22 && p[1] == 0x5a) {
+                       em28xx_isocdbg("Video frame %d, length=%i, %s\n", p[2],
+                                      len, (p[2] & 1)? "odd" : "even");
+
+                       if (!(p[2] & 1)) {
+                               if (buf != NULL)
+                                       buffer_filled(dev, dma_q, buf);
+                               get_next_buf(dma_q, &buf);
+                               if (buf == NULL)
+                                       outp = NULL;
+                               else
+                                       outp = videobuf_to_vmalloc(&buf->vb);
+                       }
+
+                       if (buf != NULL) {
+                               if (p[2] & 1)
+                                       buf->top_field = 0;
+                               else
+                                       buf->top_field = 1;
+                       }
+
+                       dma_q->pos = 0;
+               }
+               if (buf != NULL)
+                       em28xx_copy_video(dev, dma_q, buf, p, outp, len);
+       }
+       return rc;
+}
+
+/* ------------------------------------------------------------------
+       Videobuf operations
+   ------------------------------------------------------------------*/
+
+static int
+buffer_setup(struct videobuf_queue *vq, unsigned int *count, unsigned int *size)
+{
+       struct em28xx_fh *fh = vq->priv_data;
+       struct em28xx        *dev = fh->dev;
+       struct v4l2_frequency f;
+
+       *size = 16 * fh->dev->width * fh->dev->height >> 3;
+       if (0 == *count)
+               *count = EM28XX_DEF_BUF;
+
+       if (*count < EM28XX_MIN_BUF)
+               *count = EM28XX_MIN_BUF;
+
+       /* Ask tuner to go to analog mode */
+       memset(&f, 0, sizeof(f));
+       f.frequency = dev->ctl_freq;
+
+       em28xx_i2c_call_clients(dev, VIDIOC_S_FREQUENCY, &f);
+
+       return 0;
+}
+
+/* This is called *without* dev->slock held; please keep it that way */
+static void free_buffer(struct videobuf_queue *vq, struct em28xx_buffer *buf)
+{
+       struct em28xx_fh     *fh  = vq->priv_data;
+       struct em28xx        *dev = fh->dev;
+       unsigned long flags = 0;
+       if (in_interrupt())
+               BUG();
+
+       /* We used to wait for the buffer to finish here, but this didn't work
+          because, as we were keeping the state as VIDEOBUF_QUEUED,
+          videobuf_queue_cancel marked it as finished for us.
+          (Also, it could wedge forever if the hardware was misconfigured.)
+
+          This should be safe; by the time we get here, the buffer isn't
+          queued anymore. If we ever start marking the buffers as
+          VIDEOBUF_ACTIVE, it won't be, though.
+       */
+       spin_lock_irqsave(&dev->slock, flags);
+       if (dev->isoc_ctl.buf == buf)
+               dev->isoc_ctl.buf = NULL;
+       spin_unlock_irqrestore(&dev->slock, flags);
+
+       videobuf_vmalloc_free(&buf->vb);
+       buf->vb.state = VIDEOBUF_NEEDS_INIT;
+}
+
+static int
+buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
+                                               enum v4l2_field field)
+{
+       struct em28xx_fh     *fh  = vq->priv_data;
+       struct em28xx_buffer *buf = container_of(vb, struct em28xx_buffer, vb);
+       struct em28xx        *dev = fh->dev;
+       int                  rc = 0, urb_init = 0;
+
+       /* FIXME: It assumes depth = 16 */
+       /* The only currently supported format is 16 bits/pixel */
+       buf->vb.size = 16 * dev->width * dev->height >> 3;
+
+       if (0 != buf->vb.baddr  &&  buf->vb.bsize < buf->vb.size)
+               return -EINVAL;
+
+       buf->vb.width  = dev->width;
+       buf->vb.height = dev->height;
+       buf->vb.field  = field;
+
+       if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
+               rc = videobuf_iolock(vq, &buf->vb, NULL);
+               if (rc < 0)
+                       goto fail;
+       }
+
+       if (!dev->isoc_ctl.num_bufs)
+               urb_init = 1;
+
+       if (urb_init) {
+               rc = em28xx_init_isoc(dev, EM28XX_NUM_PACKETS,
+                                     EM28XX_NUM_BUFS, dev->max_pkt_size,
+                                     em28xx_isoc_copy);
+               if (rc < 0)
+                       goto fail;
+       }
+
+       buf->vb.state = VIDEOBUF_PREPARED;
+       return 0;
+
+fail:
+       free_buffer(vq, buf);
+       return rc;
+}
+
+static void
+buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+       struct em28xx_buffer    *buf     = container_of(vb, struct em28xx_buffer, vb);
+       struct em28xx_fh        *fh      = vq->priv_data;
+       struct em28xx           *dev     = fh->dev;
+       struct em28xx_dmaqueue  *vidq    = &dev->vidq;
+
+       buf->vb.state = VIDEOBUF_QUEUED;
+       list_add_tail(&buf->vb.queue, &vidq->active);
+
+}
+
+static void buffer_release(struct videobuf_queue *vq,
+                               struct videobuf_buffer *vb)
+{
+       struct em28xx_buffer   *buf  = container_of(vb, struct em28xx_buffer, vb);
+       struct em28xx_fh       *fh   = vq->priv_data;
+       struct em28xx          *dev  = (struct em28xx *)fh->dev;
 
-/*********************  v4l2 interface  ******************************************/
+       em28xx_isocdbg("em28xx: called buffer_release\n");
+
+       free_buffer(vq, buf);
+}
+
+static struct videobuf_queue_ops em28xx_video_qops = {
+       .buf_setup      = buffer_setup,
+       .buf_prepare    = buffer_prepare,
+       .buf_queue      = buffer_queue,
+       .buf_release    = buffer_release,
+};
+
+/*********************  v4l2 interface  **************************************/
 
 /*
  * em28xx_config()
@@ -118,15 +519,13 @@ static int em28xx_config(struct em28xx *dev)
 
        /* enable vbi capturing */
 
-/*     em28xx_write_regs_req(dev,0x00,0x0e,"\xC0",1); audio register */
-/*     em28xx_write_regs_req(dev,0x00,0x0f,"\x80",1); clk register */
-       em28xx_write_regs_req(dev,0x00,0x11,"\x51",1);
+/*     em28xx_write_regs_req(dev, 0x00, 0x0e, "\xC0", 1); audio register */
+/*     em28xx_write_regs_req(dev, 0x00, 0x0f, "\x80", 1); clk register */
+       em28xx_write_regs_req(dev, 0x00, 0x11, "\x51", 1);
 
-       em28xx_audio_usb_mute(dev, 1);
        dev->mute = 1;          /* maybe not the right place... */
        dev->volume = 0x1f;
-       em28xx_audio_analog_set(dev);
-       em28xx_audio_analog_setup(dev);
+
        em28xx_outfmt_set_yuv422(dev);
        em28xx_colorlevels_set_default(dev);
        em28xx_compression_disable(dev);
@@ -149,26 +548,8 @@ static void em28xx_config_i2c(struct em28xx *dev)
        em28xx_i2c_call_clients(dev, VIDIOC_STREAMON, NULL);
 }
 
-/*
- * em28xx_empty_framequeues()
- * prepare queues for incoming and outgoing frames
- */
-static void em28xx_empty_framequeues(struct em28xx *dev)
-{
-       u32 i;
-
-       INIT_LIST_HEAD(&dev->inqueue);
-       INIT_LIST_HEAD(&dev->outqueue);
-
-       for (i = 0; i < EM28XX_NUM_FRAMES; i++) {
-               dev->frame[i].state = F_UNUSED;
-               dev->frame[i].buf.bytesused = 0;
-       }
-}
-
 static void video_mux(struct em28xx *dev, int index)
 {
-       int ainput;
        struct v4l2_routing route;
 
        route.input = INPUT(index)->vmux;
@@ -179,24 +560,18 @@ static void video_mux(struct em28xx *dev, int index)
        em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route);
 
        if (dev->has_msp34xx) {
-               if (dev->i2s_speed)
-                       em28xx_i2c_call_clients(dev, VIDIOC_INT_I2S_CLOCK_FREQ, &dev->i2s_speed);
+               if (dev->i2s_speed) {
+                       em28xx_i2c_call_clients(dev, VIDIOC_INT_I2S_CLOCK_FREQ,
+                               &dev->i2s_speed);
+               }
                route.input = dev->ctl_ainput;
                route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);
                /* Note: this is msp3400 specific */
-               em28xx_i2c_call_clients(dev, VIDIOC_INT_S_AUDIO_ROUTING, &route);
-               ainput = EM28XX_AUDIO_SRC_TUNER;
-               em28xx_audio_source(dev, ainput);
-       } else {
-               switch (dev->ctl_ainput) {
-                       case 0:
-                               ainput = EM28XX_AUDIO_SRC_TUNER;
-                               break;
-                       default:
-                               ainput = EM28XX_AUDIO_SRC_LINE;
-               }
-               em28xx_audio_source(dev, ainput);
+               em28xx_i2c_call_clients(dev, VIDIOC_INT_S_AUDIO_ROUTING,
+                       &route);
        }
+
+       em28xx_audio_analog_set(dev);
 }
 
 /* Usage lock check functions */
@@ -209,15 +584,12 @@ static int res_get(struct em28xx_fh *fh)
        if (fh->stream_on)
                return rc;
 
-       mutex_lock(&dev->lock);
-
        if (dev->stream_on)
-               rc = -EINVAL;
-       else {
-               dev->stream_on = 1;
-               fh->stream_on  = 1;
-       }
+               return -EINVAL;
 
+       mutex_lock(&dev->lock);
+       dev->stream_on = 1;
+       fh->stream_on  = 1;
        mutex_unlock(&dev->lock);
        return rc;
 }
@@ -237,33 +609,6 @@ static void res_free(struct em28xx_fh *fh)
        mutex_unlock(&dev->lock);
 }
 
-/*
- * em28xx_vm_open()
- */
-static void em28xx_vm_open(struct vm_area_struct *vma)
-{
-       struct em28xx_frame_t *f = vma->vm_private_data;
-       f->vma_use_count++;
-}
-
-/*
- * em28xx_vm_close()
- */
-static void em28xx_vm_close(struct vm_area_struct *vma)
-{
-       /* NOTE: buffers are not freed here */
-       struct em28xx_frame_t *f = vma->vm_private_data;
-
-       if (f->vma_use_count)
-               f->vma_use_count--;
-}
-
-static struct vm_operations_struct em28xx_vm_ops = {
-       .open = em28xx_vm_open,
-       .close = em28xx_vm_close,
-};
-
-
 /*
  * em28xx_get_ctrl()
  * return the current saturation, brightness or contrast, mute state
@@ -292,7 +637,6 @@ static int em28xx_set_ctrl(struct em28xx *dev, const struct v4l2_control *ctrl)
        case V4L2_CID_AUDIO_MUTE:
                if (ctrl->value != dev->mute) {
                        dev->mute = ctrl->value;
-                       em28xx_audio_usb_mute(dev, ctrl->value);
                        return em28xx_audio_analog_set(dev);
                }
                return 0;
@@ -304,34 +648,6 @@ static int em28xx_set_ctrl(struct em28xx *dev, const struct v4l2_control *ctrl)
        }
 }
 
-/*
- * em28xx_stream_interrupt()
- * stops streaming
- */
-static int em28xx_stream_interrupt(struct em28xx *dev)
-{
-       int rc = 0;
-
-       /* stop reading from the device */
-
-       dev->stream = STREAM_INTERRUPT;
-       rc = wait_event_timeout(dev->wait_stream,
-                               (dev->stream == STREAM_OFF) ||
-                               (dev->state & DEV_DISCONNECTED),
-                               EM28XX_URB_TIMEOUT);
-
-       if (rc) {
-               dev->state |= DEV_MISCONFIGURED;
-               em28xx_videodbg("device is misconfigured; close and "
-                       "open /dev/video%d again\n",
-                               dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN);
-               return rc;
-       }
-
-       return 0;
-}
-
-
 static int check_dev(struct em28xx *dev)
 {
        if (dev->state & DEV_DISCONNECTED) {
@@ -378,8 +694,8 @@ static int vidioc_g_fmt_cap(struct file *file, void *priv,
        f->fmt.pix.width = dev->width;
        f->fmt.pix.height = dev->height;
        f->fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
-       f->fmt.pix.bytesperline = dev->bytesperline;
-       f->fmt.pix.sizeimage = dev->frame_size;
+       f->fmt.pix.bytesperline = dev->width * 2;
+       f->fmt.pix.sizeimage = f->fmt.pix.bytesperline  * dev->height;
        f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
 
        /* FIXME: TOP? NONE? BOTTOM? ALTENATE? */
@@ -455,7 +771,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
 {
        struct em28xx_fh      *fh  = priv;
        struct em28xx         *dev = fh->dev;
-       int                   rc, i;
+       int                   rc;
 
        rc = check_dev(dev);
        if (rc < 0)
@@ -465,49 +781,34 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
 
        mutex_lock(&dev->lock);
 
-       for (i = 0; i < dev->num_frames; i++)
-               if (dev->frame[i].vma_use_count) {
-                       em28xx_videodbg("VIDIOC_S_FMT failed. "
-                                       "Unmap the buffers first.\n");
-                       rc = -EINVAL;
-                       goto err;
-               }
-
-       /* stop io in case it is already in progress */
-       if (dev->stream == STREAM_ON) {
-               em28xx_videodbg("VIDIOC_SET_FMT: interrupting stream\n");
-               rc = em28xx_stream_interrupt(dev);
-               if (rc < 0)
-                       goto err;
+       if (videobuf_queue_is_busy(&fh->vb_vidq)) {
+               em28xx_errdev("%s queue busy\n", __func__);
+               rc = -EBUSY;
+               goto out;
        }
 
-       em28xx_release_buffers(dev);
-       dev->io = IO_NONE;
+       if (dev->stream_on && !fh->stream_on) {
+               em28xx_errdev("%s device in use by another fh\n", __func__);
+               rc = -EBUSY;
+               goto out;
+       }
 
        /* set new image size */
        dev->width = f->fmt.pix.width;
        dev->height = f->fmt.pix.height;
-       dev->frame_size = dev->width * dev->height * 2;
-       dev->field_size = dev->frame_size >> 1;
-       dev->bytesperline = dev->width * 2;
        get_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale);
 
-       /* FIXME: This is really weird! Why capture is starting with
-          this ioctl ???
-        */
-       em28xx_uninit_isoc(dev);
        em28xx_set_alternate(dev);
-       em28xx_capture_start(dev, 1);
        em28xx_resolution_set(dev);
-       em28xx_init_isoc(dev);
+
        rc = 0;
 
-err:
+out:
        mutex_unlock(&dev->lock);
        return rc;
 }
 
-static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm)
+static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id * norm)
 {
        struct em28xx_fh   *fh  = priv;
        struct em28xx      *dev = fh->dev;
@@ -532,9 +833,6 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm)
        /* set new image size */
        dev->width = f.fmt.pix.width;
        dev->height = f.fmt.pix.height;
-       dev->frame_size = dev->width * dev->height * 2;
-       dev->field_size = dev->frame_size >> 1;
-       dev->bytesperline = dev->width * 2;
        get_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale);
 
        em28xx_resolution_set(dev);
@@ -627,11 +925,11 @@ static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
 
        index = dev->ctl_ainput;
 
-       if (index == 0) {
+       if (index == 0)
                strcpy(a->name, "Television");
-       } else {
+       else
                strcpy(a->name, "Line In");
-       }
+
        a->capability = V4L2_AUDCAP_STEREO;
        a->index = index;
 
@@ -804,7 +1102,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
        struct em28xx_fh      *fh  = priv;
        struct em28xx         *dev = fh->dev;
 
-       f->type = V4L2_TUNER_ANALOG_TV;
+       f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
        f->frequency = dev->ctl_freq;
 
        return 0;
@@ -824,7 +1122,9 @@ static int vidioc_s_frequency(struct file *file, void *priv,
        if (0 != f->tuner)
                return -EINVAL;
 
-       if (V4L2_TUNER_ANALOG_TV != f->type)
+       if (unlikely(0 == fh->radio && f->type != V4L2_TUNER_ANALOG_TV))
+               return -EINVAL;
+       if (unlikely(1 == fh->radio && f->type != V4L2_TUNER_RADIO))
                return -EINVAL;
 
        mutex_lock(&dev->lock);
@@ -836,6 +1136,63 @@ static int vidioc_s_frequency(struct file *file, void *priv,
        return 0;
 }
 
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+static int em28xx_reg_len(int reg)
+{
+       switch (reg) {
+       case EM28XX_R40_AC97LSB:
+       case EM28XX_R30_HSCALELOW:
+       case EM28XX_R32_VSCALELOW:
+               return 2;
+       default:
+               return 1;
+       }
+}
+
+static int vidioc_g_register(struct file *file, void *priv,
+                            struct v4l2_register *reg)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       int ret;
+
+       if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
+               return -EINVAL;
+
+       if (em28xx_reg_len(reg->reg) == 1) {
+               ret = em28xx_read_reg(dev, reg->reg);
+               if (ret < 0)
+                       return ret;
+
+               reg->val = ret;
+       } else {
+               u64 val = 0;
+               ret = em28xx_read_reg_req_len(dev, USB_REQ_GET_STATUS,
+                                                  reg->reg, (char *)&val, 2);
+               if (ret < 0)
+                       return ret;
+
+               reg->val = cpu_to_le64((__u64)val);
+       }
+
+       return 0;
+}
+
+static int vidioc_s_register(struct file *file, void *priv,
+                            struct v4l2_register *reg)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       u64 buf;
+
+       buf = le64_to_cpu((__u64)reg->val);
+
+       return em28xx_write_regs(dev, reg->reg, (char *)&buf,
+                                em28xx_reg_len(reg->reg));
+}
+#endif
+
+
 static int vidioc_cropcap(struct file *file, void *priv,
                                        struct v4l2_cropcap *cc)
 {
@@ -867,23 +1224,11 @@ static int vidioc_streamon(struct file *file, void *priv,
        if (rc < 0)
                return rc;
 
-       if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE || dev->io != IO_MMAP)
-               return -EINVAL;
-
-       if (list_empty(&dev->inqueue))
-               return -EINVAL;
-
-       mutex_lock(&dev->lock);
 
-       if (unlikely(res_get(fh) < 0)) {
-               mutex_unlock(&dev->lock);
+       if (unlikely(res_get(fh) < 0))
                return -EBUSY;
-       }
 
-       dev->stream = STREAM_ON;        /* FIXME: Start video capture here? */
-
-       mutex_unlock(&dev->lock);
-       return 0;
+       return (videobuf_streamon(&fh->vb_vidq));
 }
 
 static int vidioc_streamoff(struct file *file, void *priv,
@@ -897,23 +1242,14 @@ static int vidioc_streamoff(struct file *file, void *priv,
        if (rc < 0)
                return rc;
 
-       if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE || dev->io != IO_MMAP)
+       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       if (type != fh->type)
                return -EINVAL;
 
-       mutex_lock(&dev->lock);
-
-       if (dev->stream == STREAM_ON) {
-               em28xx_videodbg("VIDIOC_STREAMOFF: interrupting stream\n");
-               rc = em28xx_stream_interrupt(dev);
-               if (rc < 0) {
-                       mutex_unlock(&dev->lock);
-                       return rc;
-               }
-       }
-
-       em28xx_empty_framequeues(dev);
+       videobuf_streamoff(&fh->vb_vidq);
+       res_free(fh);
 
-       mutex_unlock(&dev->lock);
        return 0;
 }
 
@@ -935,7 +1271,7 @@ static int vidioc_querycap(struct file *file, void  *priv,
                        V4L2_CAP_AUDIO |
                        V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
 
-       if (dev->has_tuner)
+       if (dev->tuner_type != TUNER_ABSENT)
                cap->capabilities |= V4L2_CAP_TUNER;
 
        return 0;
@@ -1007,53 +1343,13 @@ static int vidioc_reqbufs(struct file *file, void *priv,
 {
        struct em28xx_fh      *fh  = priv;
        struct em28xx         *dev = fh->dev;
-       u32                   i;
        int                   rc;
 
        rc = check_dev(dev);
        if (rc < 0)
                return rc;
 
-       if (rb->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
-               rb->memory != V4L2_MEMORY_MMAP)
-               return -EINVAL;
-
-       if (dev->io == IO_READ) {
-               em28xx_videodbg("method is set to read;"
-                               " close and open the device again to"
-                               " choose the mmap I/O method\n");
-               return -EINVAL;
-       }
-
-       for (i = 0; i < dev->num_frames; i++)
-               if (dev->frame[i].vma_use_count) {
-                       em28xx_videodbg("VIDIOC_REQBUFS failed; "
-                                       "previous buffers are still mapped\n");
-                       return -EINVAL;
-               }
-
-       mutex_lock(&dev->lock);
-
-       if (dev->stream == STREAM_ON) {
-               em28xx_videodbg("VIDIOC_REQBUFS: interrupting stream\n");
-               rc = em28xx_stream_interrupt(dev);
-               if (rc < 0) {
-                       mutex_unlock(&dev->lock);
-                       return rc;
-               }
-       }
-
-       em28xx_empty_framequeues(dev);
-
-       em28xx_release_buffers(dev);
-       if (rb->count)
-               rb->count = em28xx_request_buffers(dev, rb->count);
-
-       dev->frame_current = NULL;
-       dev->io = rb->count ? IO_MMAP : IO_NONE;
-
-       mutex_unlock(&dev->lock);
-       return 0;
+       return (videobuf_reqbufs(&fh->vb_vidq, rb));
 }
 
 static int vidioc_querybuf(struct file *file, void *priv,
@@ -1067,52 +1363,20 @@ static int vidioc_querybuf(struct file *file, void *priv,
        if (rc < 0)
                return rc;
 
-       if (b->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
-               b->index >= dev->num_frames || dev->io != IO_MMAP)
-               return -EINVAL;
-
-       mutex_lock(&dev->lock);
-
-       memcpy(b, &dev->frame[b->index].buf, sizeof(*b));
-
-       if (dev->frame[b->index].vma_use_count)
-               b->flags |= V4L2_BUF_FLAG_MAPPED;
-
-       if (dev->frame[b->index].state == F_DONE)
-               b->flags |= V4L2_BUF_FLAG_DONE;
-       else if (dev->frame[b->index].state != F_UNUSED)
-               b->flags |= V4L2_BUF_FLAG_QUEUED;
-
-       mutex_unlock(&dev->lock);
-       return 0;
+       return (videobuf_querybuf(&fh->vb_vidq, b));
 }
 
 static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *b)
 {
        struct em28xx_fh      *fh  = priv;
        struct em28xx         *dev = fh->dev;
-       unsigned long         lock_flags;
        int                   rc;
 
        rc = check_dev(dev);
        if (rc < 0)
                return rc;
 
-       if (b->type != V4L2_BUF_TYPE_VIDEO_CAPTURE  || dev->io != IO_MMAP ||
-                                               b->index >= dev->num_frames)
-               return -EINVAL;
-
-       if (dev->frame[b->index].state != F_UNUSED)
-               return -EAGAIN;
-
-       dev->frame[b->index].state = F_QUEUED;
-
-       /* add frame to fifo */
-       spin_lock_irqsave(&dev->queue_lock, lock_flags);
-       list_add_tail(&dev->frame[b->index].frame, &dev->inqueue);
-       spin_unlock_irqrestore(&dev->queue_lock, lock_flags);
-
-       return 0;
+       return (videobuf_qbuf(&fh->vb_vidq, b));
 }
 
 static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b)
@@ -1120,47 +1384,121 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b)
        struct em28xx_fh      *fh  = priv;
        struct em28xx         *dev = fh->dev;
        int                   rc;
-       struct em28xx_frame_t *f;
-       unsigned long         lock_flags;
 
        rc = check_dev(dev);
        if (rc < 0)
                return rc;
 
-       if (b->type != V4L2_BUF_TYPE_VIDEO_CAPTURE || dev->io != IO_MMAP)
+       return (videobuf_dqbuf(&fh->vb_vidq, b,
+                               file->f_flags & O_NONBLOCK));
+}
+
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)
+{
+       struct em28xx_fh  *fh = priv;
+
+       return videobuf_cgmbuf(&fh->vb_vidq, mbuf, 8);
+}
+#endif
+
+
+/* ----------------------------------------------------------- */
+/* RADIO ESPECIFIC IOCTLS                                      */
+/* ----------------------------------------------------------- */
+
+static int radio_querycap(struct file *file, void  *priv,
+                         struct v4l2_capability *cap)
+{
+       struct em28xx *dev = ((struct em28xx_fh *)priv)->dev;
+
+       strlcpy(cap->driver, "em28xx", sizeof(cap->driver));
+       strlcpy(cap->card, em28xx_boards[dev->model].name, sizeof(cap->card));
+       strlcpy(cap->bus_info, dev->udev->dev.bus_id, sizeof(cap->bus_info));
+
+       cap->version = EM28XX_VERSION_CODE;
+       cap->capabilities = V4L2_CAP_TUNER;
+       return 0;
+}
+
+static int radio_g_tuner(struct file *file, void *priv,
+                        struct v4l2_tuner *t)
+{
+       struct em28xx *dev = ((struct em28xx_fh *)priv)->dev;
+
+       if (unlikely(t->index > 0))
+               return -EINVAL;
+
+       strcpy(t->name, "Radio");
+       t->type = V4L2_TUNER_RADIO;
+
+       em28xx_i2c_call_clients(dev, VIDIOC_G_TUNER, t);
+       return 0;
+}
+
+static int radio_enum_input(struct file *file, void *priv,
+                           struct v4l2_input *i)
+{
+       if (i->index != 0)
                return -EINVAL;
+       strcpy(i->name, "Radio");
+       i->type = V4L2_INPUT_TYPE_TUNER;
+
+       return 0;
+}
 
-       if (list_empty(&dev->outqueue)) {
-               if (dev->stream == STREAM_OFF)
-                       return -EINVAL;
+static int radio_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
+{
+       if (unlikely(a->index))
+               return -EINVAL;
 
-               if (file->f_flags & O_NONBLOCK)
-                       return -EAGAIN;
+       strcpy(a->name, "Radio");
+       return 0;
+}
 
-               rc = wait_event_interruptible(dev->wait_frame,
-                                       (!list_empty(&dev->outqueue)) ||
-                                       (dev->state & DEV_DISCONNECTED));
-               if (rc)
-                       return rc;
+static int radio_s_tuner(struct file *file, void *priv,
+                        struct v4l2_tuner *t)
+{
+       struct em28xx *dev = ((struct em28xx_fh *)priv)->dev;
 
-               if (dev->state & DEV_DISCONNECTED)
-                       return -ENODEV;
-       }
+       if (0 != t->index)
+               return -EINVAL;
 
-       spin_lock_irqsave(&dev->queue_lock, lock_flags);
-       f = list_entry(dev->outqueue.next, struct em28xx_frame_t, frame);
-       list_del(dev->outqueue.next);
-       spin_unlock_irqrestore(&dev->queue_lock, lock_flags);
+       em28xx_i2c_call_clients(dev, VIDIOC_S_TUNER, t);
 
-       f->state = F_UNUSED;
-       memcpy(b, &f->buf, sizeof(*b));
+       return 0;
+}
 
-       if (f->vma_use_count)
-               b->flags |= V4L2_BUF_FLAG_MAPPED;
+static int radio_s_audio(struct file *file, void *fh,
+                        struct v4l2_audio *a)
+{
+       return 0;
+}
 
+static int radio_s_input(struct file *file, void *fh, unsigned int i)
+{
        return 0;
 }
 
+static int radio_queryctrl(struct file *file, void *priv,
+                          struct v4l2_queryctrl *qc)
+{
+       int i;
+
+       if (qc->id <  V4L2_CID_BASE ||
+               qc->id >= V4L2_CID_LASTP1)
+               return -EINVAL;
+
+       for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) {
+               if (qc->id && qc->id == em28xx_qctrl[i].id) {
+                       memcpy(qc, &(em28xx_qctrl[i]), sizeof(*qc));
+                       return 0;
+               }
+       }
+
+       return -EINVAL;
+}
+
 /*
  * em28xx_v4l2_open()
  * inits the device and starts isoc transfer
@@ -1168,63 +1506,73 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b)
 static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
 {
        int minor = iminor(inode);
-       int errCode = 0;
-       struct em28xx *h,*dev = NULL;
+       int errCode = 0, radio = 0;
+       struct em28xx *h, *dev = NULL;
        struct em28xx_fh *fh;
+       enum v4l2_buf_type fh_type = 0;
 
        list_for_each_entry(h, &em28xx_devlist, devlist) {
                if (h->vdev->minor == minor) {
                        dev  = h;
-                       dev->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                       fh_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
                }
                if (h->vbi_dev->minor == minor) {
                        dev  = h;
-                       dev->type = V4L2_BUF_TYPE_VBI_CAPTURE;
+                       fh_type = V4L2_BUF_TYPE_VBI_CAPTURE;
+               }
+               if (h->radio_dev &&
+                   h->radio_dev->minor == minor) {
+                       radio = 1;
+                       dev   = h;
                }
        }
        if (NULL == dev)
                return -ENODEV;
 
        em28xx_videodbg("open minor=%d type=%s users=%d\n",
-                               minor,v4l2_type_names[dev->type],dev->users);
+                               minor, v4l2_type_names[fh_type], dev->users);
 
-       fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL);
 
+       fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL);
        if (!fh) {
                em28xx_errdev("em28xx-video.c: Out of memory?!\n");
                return -ENOMEM;
        }
        mutex_lock(&dev->lock);
        fh->dev = dev;
+       fh->radio = radio;
+       fh->type = fh_type;
        filp->private_data = fh;
 
-       if (dev->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && dev->users == 0) {
-               em28xx_set_alternate(dev);
-
+       if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && dev->users == 0) {
                dev->width = norm_maxw(dev);
                dev->height = norm_maxh(dev);
-               dev->frame_size = dev->width * dev->height * 2;
-               dev->field_size = dev->frame_size >> 1; /*both_fileds ? dev->frame_size>>1 : dev->frame_size; */
-               dev->bytesperline = dev->width * 2;
                dev->hscale = 0;
                dev->vscale = 0;
 
-               em28xx_capture_start(dev, 1);
+               em28xx_set_mode(dev, EM28XX_ANALOG_MODE);
+               em28xx_set_alternate(dev);
                em28xx_resolution_set(dev);
 
+               /* Needed, since GPIO might have disabled power of
+                  some i2c device
+                */
+               em28xx_config_i2c(dev);
 
-               /* start the transfer */
-               errCode = em28xx_init_isoc(dev);
-               if (errCode)
-                       goto err;
-
-               em28xx_empty_framequeues(dev);
+       }
+       if (fh->radio) {
+               em28xx_videodbg("video_open: setting radio device\n");
+               em28xx_i2c_call_clients(dev, AUDC_SET_RADIO, NULL);
        }
 
        dev->users++;
 
-err:
+       videobuf_queue_vmalloc_init(&fh->vb_vidq, &em28xx_video_qops,
+                       NULL, &dev->slock, fh->type, V4L2_FIELD_INTERLACED,
+                       sizeof(struct em28xx_buffer), fh);
+
        mutex_unlock(&dev->lock);
+
        return errCode;
 }
 
@@ -1242,19 +1590,38 @@ static void em28xx_release_resources(struct em28xx *dev)
                                dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN,
                                dev->vbi_dev->minor-MINOR_VFL_TYPE_VBI_MIN);
        list_del(&dev->devlist);
-       video_unregister_device(dev->vdev);
-       video_unregister_device(dev->vbi_dev);
+       if (dev->radio_dev) {
+               if (-1 != dev->radio_dev->minor)
+                       video_unregister_device(dev->radio_dev);
+               else
+                       video_device_release(dev->radio_dev);
+               dev->radio_dev = NULL;
+       }
+       if (dev->vbi_dev) {
+               if (-1 != dev->vbi_dev->minor)
+                       video_unregister_device(dev->vbi_dev);
+               else
+                       video_device_release(dev->vbi_dev);
+               dev->vbi_dev = NULL;
+       }
+       if (dev->vdev) {
+               if (-1 != dev->vdev->minor)
+                       video_unregister_device(dev->vdev);
+               else
+                       video_device_release(dev->vdev);
+               dev->vdev = NULL;
+       }
        em28xx_i2c_unregister(dev);
        usb_put_dev(dev->udev);
 
-
        /* Mark device as unused */
-       em28xx_devused&=~(1<<dev->devno);
+       em28xx_devused &= ~(1<<dev->devno);
 }
 
 /*
  * em28xx_v4l2_close()
- * stops streaming and deallocates all resources allocated by the v4l2 calls and ioctls
+ * stops streaming and deallocates all resources allocated by the v4l2
+ * calls and ioctls
  */
 static int em28xx_v4l2_close(struct inode *inode, struct file *filp)
 {
@@ -1271,9 +1638,8 @@ static int em28xx_v4l2_close(struct inode *inode, struct file *filp)
        mutex_lock(&dev->lock);
 
        if (dev->users == 1) {
-               em28xx_uninit_isoc(dev);
-               em28xx_release_buffers(dev);
-               dev->io = IO_NONE;
+               videobuf_stop(&fh->vb_vidq);
+               videobuf_mmap_free(&fh->vb_vidq);
 
                /* the device is already disconnect,
                   free the remaining resources */
@@ -1284,6 +1650,10 @@ static int em28xx_v4l2_close(struct inode *inode, struct file *filp)
                        return 0;
                }
 
+               /* do this before setting alternate! */
+               em28xx_uninit_isoc(dev);
+               em28xx_set_mode(dev, EM28XX_MODE_UNDEFINED);
+
                /* set alternate 0 */
                dev->alt = 0;
                em28xx_videodbg("setting alternate 0\n");
@@ -1305,135 +1675,29 @@ static int em28xx_v4l2_close(struct inode *inode, struct file *filp)
  * will allocate buffers when called for the first time
  */
 static ssize_t
-em28xx_v4l2_read(struct file *filp, char __user * buf, size_t count,
-                loff_t * f_pos)
+em28xx_v4l2_read(struct file *filp, char __user *buf, size_t count,
+                loff_t *pos)
 {
-       struct em28xx_frame_t *f, *i;
-       unsigned long lock_flags;
-       int ret = 0;
        struct em28xx_fh *fh = filp->private_data;
        struct em28xx *dev = fh->dev;
+       int rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
 
        /* FIXME: read() is not prepared to allow changing the video
           resolution while streaming. Seems a bug at em28xx_set_fmt
         */
 
-       if (unlikely(res_get(fh) < 0))
-               return -EBUSY;
-
-       mutex_lock(&dev->lock);
-
-       if (dev->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
-               em28xx_videodbg("V4l2_Buf_type_videocapture is set\n");
-
-       if (dev->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
-               em28xx_videodbg("V4L2_BUF_TYPE_VBI_CAPTURE is set\n");
-               em28xx_videodbg("not supported yet! ...\n");
-               if (copy_to_user(buf, "", 1)) {
-                       mutex_unlock(&dev->lock);
-                       return -EFAULT;
-               }
-               mutex_unlock(&dev->lock);
-               return (1);
-       }
-       if (dev->type == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE) {
-               em28xx_videodbg("V4L2_BUF_TYPE_SLICED_VBI_CAPTURE is set\n");
-               em28xx_videodbg("not supported yet! ...\n");
-               if (copy_to_user(buf, "", 1)) {
-                       mutex_unlock(&dev->lock);
-                       return -EFAULT;
-               }
-               mutex_unlock(&dev->lock);
-               return (1);
-       }
+       if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+               if (unlikely(res_get(fh)))
+                       return -EBUSY;
 
-       if (dev->state & DEV_DISCONNECTED) {
-               em28xx_videodbg("device not present\n");
-               mutex_unlock(&dev->lock);
-               return -ENODEV;
+               return videobuf_read_stream(&fh->vb_vidq, buf, count, pos, 0,
+                                       filp->f_flags & O_NONBLOCK);
        }
-
-       if (dev->state & DEV_MISCONFIGURED) {
-               em28xx_videodbg("device misconfigured; close and open it again\n");
-               mutex_unlock(&dev->lock);
-               return -EIO;
-       }
-
-       if (dev->io == IO_MMAP) {
-               em28xx_videodbg ("IO method is set to mmap; close and open"
-                               " the device again to choose the read method\n");
-               mutex_unlock(&dev->lock);
-               return -EINVAL;
-       }
-
-       if (dev->io == IO_NONE) {
-               if (!em28xx_request_buffers(dev, EM28XX_NUM_READ_FRAMES)) {
-                       em28xx_errdev("read failed, not enough memory\n");
-                       mutex_unlock(&dev->lock);
-                       return -ENOMEM;
-               }
-               dev->io = IO_READ;
-               dev->stream = STREAM_ON;
-               em28xx_queue_unusedframes(dev);
-       }
-
-       if (!count) {
-               mutex_unlock(&dev->lock);
-               return 0;
-       }
-
-       if (list_empty(&dev->outqueue)) {
-               if (filp->f_flags & O_NONBLOCK) {
-                       mutex_unlock(&dev->lock);
-                       return -EAGAIN;
-               }
-               ret = wait_event_interruptible
-                   (dev->wait_frame,
-                    (!list_empty(&dev->outqueue)) ||
-                    (dev->state & DEV_DISCONNECTED));
-               if (ret) {
-                       mutex_unlock(&dev->lock);
-                       return ret;
-               }
-               if (dev->state & DEV_DISCONNECTED) {
-                       mutex_unlock(&dev->lock);
-                       return -ENODEV;
-               }
-               dev->video_bytesread = 0;
-       }
-
-       f = list_entry(dev->outqueue.prev, struct em28xx_frame_t, frame);
-
-       em28xx_queue_unusedframes(dev);
-
-       if (count > f->buf.length)
-               count = f->buf.length;
-
-       if ((dev->video_bytesread + count) > dev->frame_size)
-               count = dev->frame_size - dev->video_bytesread;
-
-       if (copy_to_user(buf, f->bufmem+dev->video_bytesread, count)) {
-               em28xx_err("Error while copying to user\n");
-               return -EFAULT;
-       }
-       dev->video_bytesread += count;
-
-       if (dev->video_bytesread == dev->frame_size) {
-               spin_lock_irqsave(&dev->queue_lock, lock_flags);
-               list_for_each_entry(i, &dev->outqueue, frame)
-                                   i->state = F_UNUSED;
-               INIT_LIST_HEAD(&dev->outqueue);
-               spin_unlock_irqrestore(&dev->queue_lock, lock_flags);
-
-               em28xx_queue_unusedframes(dev);
-               dev->video_bytesread = 0;
-       }
-
-       *f_pos += count;
-
-       mutex_unlock(&dev->lock);
-
-       return count;
+       return 0;
 }
 
 /*
@@ -1442,46 +1706,21 @@ em28xx_v4l2_read(struct file *filp, char __user * buf, size_t count,
  */
 static unsigned int em28xx_v4l2_poll(struct file *filp, poll_table * wait)
 {
-       unsigned int mask = 0;
        struct em28xx_fh *fh = filp->private_data;
        struct em28xx *dev = fh->dev;
+       int rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
 
        if (unlikely(res_get(fh) < 0))
                return POLLERR;
 
-       mutex_lock(&dev->lock);
-
-       if (dev->state & DEV_DISCONNECTED) {
-               em28xx_videodbg("device not present\n");
-       } else if (dev->state & DEV_MISCONFIGURED) {
-               em28xx_videodbg("device is misconfigured; close and open it again\n");
-       } else {
-               if (dev->io == IO_NONE) {
-                       if (!em28xx_request_buffers
-                           (dev, EM28XX_NUM_READ_FRAMES)) {
-                               em28xx_warn
-                                   ("poll() failed, not enough memory\n");
-                       } else {
-                               dev->io = IO_READ;
-                               dev->stream = STREAM_ON;
-                       }
-               }
-
-               if (dev->io == IO_READ) {
-                       em28xx_queue_unusedframes(dev);
-                       poll_wait(filp, &dev->wait_frame, wait);
-
-                       if (!list_empty(&dev->outqueue))
-                               mask |= POLLIN | POLLRDNORM;
-
-                       mutex_unlock(&dev->lock);
-
-                       return mask;
-               }
-       }
+       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != fh->type)
+               return POLLERR;
 
-       mutex_unlock(&dev->lock);
-       return POLLERR;
+       return videobuf_poll_stream(filp, &fh->vb_vidq, wait);
 }
 
 /*
@@ -1491,69 +1730,23 @@ static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
 {
        struct em28xx_fh *fh    = filp->private_data;
        struct em28xx    *dev   = fh->dev;
-       unsigned long    size   = vma->vm_end - vma->vm_start;
-       unsigned long    start  = vma->vm_start;
-       void             *pos;
-       u32              i;
+       int              rc;
 
        if (unlikely(res_get(fh) < 0))
                return -EBUSY;
 
-       mutex_lock(&dev->lock);
-
-       if (dev->state & DEV_DISCONNECTED) {
-               em28xx_videodbg("mmap: device not present\n");
-               mutex_unlock(&dev->lock);
-               return -ENODEV;
-       }
-
-       if (dev->state & DEV_MISCONFIGURED) {
-               em28xx_videodbg ("mmap: Device is misconfigured; close and "
-                                               "open it again\n");
-               mutex_unlock(&dev->lock);
-               return -EIO;
-       }
-
-       if (dev->io != IO_MMAP || !(vma->vm_flags & VM_WRITE)) {
-               mutex_unlock(&dev->lock);
-               return -EINVAL;
-       }
-
-       if (size > PAGE_ALIGN(dev->frame[0].buf.length))
-               size = PAGE_ALIGN(dev->frame[0].buf.length);
-
-       for (i = 0; i < dev->num_frames; i++) {
-               if ((dev->frame[i].buf.m.offset >> PAGE_SHIFT) == vma->vm_pgoff)
-                       break;
-       }
-       if (i == dev->num_frames) {
-               em28xx_videodbg("mmap: user supplied mapping address is out of range\n");
-               mutex_unlock(&dev->lock);
-               return -EINVAL;
-       }
-
-       /* VM_IO is eventually going to replace PageReserved altogether */
-       vma->vm_flags |= VM_IO;
-       vma->vm_flags |= VM_RESERVED;   /* avoid to swap out this VMA */
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
 
-       pos = dev->frame[i].bufmem;
-       while (size > 0) {      /* size is page-aligned */
-               if (vm_insert_page(vma, start, vmalloc_to_page(pos))) {
-                       em28xx_videodbg("mmap: vm_insert_page failed\n");
-                       mutex_unlock(&dev->lock);
-                       return -EAGAIN;
-               }
-               start += PAGE_SIZE;
-               pos += PAGE_SIZE;
-               size -= PAGE_SIZE;
-       }
+       rc = videobuf_mmap_mapper(&fh->vb_vidq, vma);
 
-       vma->vm_ops = &em28xx_vm_ops;
-       vma->vm_private_data = &dev->frame[i];
+       em28xx_videodbg("vma start=0x%08lx, size=%ld, ret=%d\n",
+               (unsigned long)vma->vm_start,
+               (unsigned long)vma->vm_end-(unsigned long)vma->vm_start,
+               rc);
 
-       em28xx_vm_open(vma);
-       mutex_unlock(&dev->lock);
-       return 0;
+       return rc;
 }
 
 static const struct file_operations em28xx_v4l_fops = {
@@ -1568,6 +1761,15 @@ static const struct file_operations em28xx_v4l_fops = {
        .compat_ioctl  = v4l_compat_ioctl32,
 };
 
+static const struct file_operations radio_fops = {
+       .owner         = THIS_MODULE,
+       .open          = em28xx_v4l2_open,
+       .release       = em28xx_v4l2_close,
+       .ioctl         = video_ioctl2,
+       .compat_ioctl  = v4l_compat_ioctl32,
+       .llseek        = no_llseek,
+};
+
 static const struct video_device em28xx_video_template = {
        .fops                       = &em28xx_v4l_fops,
        .release                    = video_device_release,
@@ -1603,13 +1805,106 @@ static const struct video_device em28xx_video_template = {
        .vidioc_s_tuner             = vidioc_s_tuner,
        .vidioc_g_frequency         = vidioc_g_frequency,
        .vidioc_s_frequency         = vidioc_s_frequency,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register          = vidioc_g_register,
+       .vidioc_s_register          = vidioc_s_register,
+#endif
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+       .vidiocgmbuf                = vidiocgmbuf,
+#endif
 
        .tvnorms                    = V4L2_STD_ALL,
        .current_norm               = V4L2_STD_PAL,
 };
 
+static struct video_device em28xx_radio_template = {
+       .name                 = "em28xx-radio",
+       .type                 = VID_TYPE_TUNER,
+       .fops                 = &radio_fops,
+       .minor                = -1,
+       .vidioc_querycap      = radio_querycap,
+       .vidioc_g_tuner       = radio_g_tuner,
+       .vidioc_enum_input    = radio_enum_input,
+       .vidioc_g_audio       = radio_g_audio,
+       .vidioc_s_tuner       = radio_s_tuner,
+       .vidioc_s_audio       = radio_s_audio,
+       .vidioc_s_input       = radio_s_input,
+       .vidioc_queryctrl     = radio_queryctrl,
+       .vidioc_g_ctrl        = vidioc_g_ctrl,
+       .vidioc_s_ctrl        = vidioc_s_ctrl,
+       .vidioc_g_frequency   = vidioc_g_frequency,
+       .vidioc_s_frequency   = vidioc_s_frequency,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register    = vidioc_g_register,
+       .vidioc_s_register    = vidioc_s_register,
+#endif
+};
+
+/******************************** usb interface ******************************/
+
+
+static LIST_HEAD(em28xx_extension_devlist);
+static DEFINE_MUTEX(em28xx_extension_devlist_lock);
+
+int em28xx_register_extension(struct em28xx_ops *ops)
+{
+       struct em28xx *h, *dev = NULL;
+
+       list_for_each_entry(h, &em28xx_devlist, devlist)
+               dev = h;
+
+       mutex_lock(&em28xx_extension_devlist_lock);
+       list_add_tail(&ops->next, &em28xx_extension_devlist);
+       if (dev)
+               ops->init(dev);
+
+       printk(KERN_INFO "Em28xx: Initialized (%s) extension\n", ops->name);
+       mutex_unlock(&em28xx_extension_devlist_lock);
+
+       return 0;
+}
+EXPORT_SYMBOL(em28xx_register_extension);
+
+void em28xx_unregister_extension(struct em28xx_ops *ops)
+{
+       struct em28xx *h, *dev = NULL;
+
+       list_for_each_entry(h, &em28xx_devlist, devlist)
+               dev = h;
+
+       if (dev)
+               ops->fini(dev);
+
+       mutex_lock(&em28xx_extension_devlist_lock);
+       printk(KERN_INFO "Em28xx: Removed (%s) extension\n", ops->name);
+       list_del(&ops->next);
+       mutex_unlock(&em28xx_extension_devlist_lock);
+}
+EXPORT_SYMBOL(em28xx_unregister_extension);
+
+static struct video_device *em28xx_vdev_init(struct em28xx *dev,
+                                            const struct video_device *template,
+                                            const int type,
+                                            const char *type_name)
+{
+       struct video_device *vfd;
+
+       vfd = video_device_alloc();
+       if (NULL == vfd)
+               return NULL;
+       *vfd = *template;
+       vfd->minor   = -1;
+       vfd->dev = &dev->udev->dev;
+       vfd->release = video_device_release;
+       vfd->type = type;
+       vfd->debug = video_debug;
+
+       snprintf(vfd->name, sizeof(vfd->name), "%s %s",
+                dev->name, type_name);
+
+       return vfd;
+}
 
-/******************************** usb interface *****************************************/
 
 /*
  * em28xx_init_dev()
@@ -1618,6 +1913,7 @@ static const struct video_device em28xx_video_template = {
 static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
                           int minor)
 {
+       struct em28xx_ops *ops = NULL;
        struct em28xx *dev = *devhandle;
        int retval = -ENOMEM;
        int errCode;
@@ -1625,7 +1921,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
 
        dev->udev = udev;
        mutex_init(&dev->lock);
-       spin_lock_init(&dev->queue_lock);
+       spin_lock_init(&dev->slock);
        init_waitqueue_head(&dev->open);
        init_waitqueue_head(&dev->wait_frame);
        init_waitqueue_head(&dev->wait_stream);
@@ -1653,6 +1949,9 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
        /* Do board specific init and eeprom reading */
        em28xx_card_setup(dev);
 
+       /* Configure audio */
+       em28xx_audio_analog_set(dev);
+
        /* configure the device */
        em28xx_config_i2c(dev);
 
@@ -1666,50 +1965,65 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
        dev->width = maxw;
        dev->height = maxh;
        dev->interlaced = EM28XX_INTERLACED_DEFAULT;
-       dev->field_size = dev->width * dev->height;
-       dev->frame_size =
-           dev->interlaced ? dev->field_size << 1 : dev->field_size;
-       dev->bytesperline = dev->width * 2;
        dev->hscale = 0;
        dev->vscale = 0;
        dev->ctl_input = 2;
 
        errCode = em28xx_config(dev);
 
+       list_add_tail(&dev->devlist, &em28xx_devlist);
+
        /* allocate and fill video video_device struct */
-       dev->vdev = video_device_alloc();
+       dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template,
+                                         VID_TYPE_CAPTURE, "video");
        if (NULL == dev->vdev) {
                em28xx_errdev("cannot allocate video_device.\n");
-               em28xx_devused&=~(1<<dev->devno);
-               kfree(dev);
-               return -ENOMEM;
+               goto fail_unreg;
        }
-       memcpy(dev->vdev, &em28xx_video_template,
-                                       sizeof(em28xx_video_template));
-       dev->vdev->type = VID_TYPE_CAPTURE;
-       if (dev->has_tuner)
+       if (dev->tuner_type != TUNER_ABSENT)
                dev->vdev->type |= VID_TYPE_TUNER;
-       dev->vdev->dev = &dev->udev->dev;
-       snprintf(dev->vdev->name, sizeof(dev->vbi_dev->name),
-                "%s#%d %s", "em28xx", dev->devno, "video");
+
+       /* register v4l2 video video_device */
+       retval = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
+                                      video_nr[dev->devno]);
+       if (retval) {
+               em28xx_errdev("unable to register video device (error=%i).\n",
+                             retval);
+               goto fail_unreg;
+       }
 
        /* Allocate and fill vbi video_device struct */
-       dev->vbi_dev = video_device_alloc();
-       if (NULL == dev->vbi_dev) {
-               em28xx_errdev("cannot allocate video_device.\n");
-               kfree(dev->vdev);
-               em28xx_devused&=~(1<<dev->devno);
-               kfree(dev);
-               return -ENOMEM;
+       dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template,
+                                         VFL_TYPE_VBI, "vbi");
+       /* register v4l2 vbi video_device */
+       if (video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
+                                       vbi_nr[dev->devno]) < 0) {
+               em28xx_errdev("unable to register vbi device\n");
+               retval = -ENODEV;
+               goto fail_unreg;
+       }
+
+       if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) {
+               dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template,
+                                       VFL_TYPE_RADIO, "radio");
+               if (NULL == dev->radio_dev) {
+                       em28xx_errdev("cannot allocate video_device.\n");
+                       goto fail_unreg;
+               }
+               retval = video_register_device(dev->radio_dev, VFL_TYPE_RADIO,
+                                           radio_nr[dev->devno]);
+               if (retval < 0) {
+                       em28xx_errdev("can't register radio device\n");
+                       goto fail_unreg;
+               }
+               em28xx_info("Registered radio device as /dev/radio%d\n",
+                           dev->radio_dev->minor & 0x1f);
        }
-       memcpy(dev->vbi_dev, &em28xx_video_template,
-                                       sizeof(em28xx_video_template));
-       dev->vbi_dev->type = VFL_TYPE_VBI;
-       dev->vbi_dev->dev = &dev->udev->dev;
-       snprintf(dev->vbi_dev->name, sizeof(dev->vbi_dev->name),
-                               "%s#%d %s", "em28xx", dev->devno, "vbi");
 
-       list_add_tail(&dev->devlist,&em28xx_devlist);
+       /* init video dma queues */
+       INIT_LIST_HEAD(&dev->vidq.active);
+       INIT_LIST_HEAD(&dev->vidq.queued);
+
 
        if (dev->has_msp34xx) {
                /* Send a reset to other chips via gpio */
@@ -1721,39 +2035,52 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
 
        video_mux(dev, 0);
 
-       /* register v4l2 video video_device */
-       if ((retval = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
-                                        video_nr[dev->devno]))) {
-               em28xx_errdev("unable to register video device (error=%i).\n",
-                             retval);
-               mutex_unlock(&dev->lock);
-               list_del(&dev->devlist);
-               video_device_release(dev->vdev);
-               em28xx_devused&=~(1<<dev->devno);
-               kfree(dev);
-               return -ENODEV;
-       }
-
-       /* register v4l2 vbi video_device */
-       if (video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
-                                       vbi_nr[dev->devno]) < 0) {
-               printk("unable to register vbi device\n");
-               mutex_unlock(&dev->lock);
-               list_del(&dev->devlist);
-               video_device_release(dev->vbi_dev);
-               video_device_release(dev->vdev);
-               em28xx_devused&=~(1<<dev->devno);
-               kfree(dev);
-               return -ENODEV;
-       }
-
        em28xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n",
                                dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN,
                                dev->vbi_dev->minor-MINOR_VFL_TYPE_VBI_MIN);
 
+       mutex_lock(&em28xx_extension_devlist_lock);
+       if (!list_empty(&em28xx_extension_devlist)) {
+               list_for_each_entry(ops, &em28xx_extension_devlist, next) {
+                       if (ops->id)
+                               ops->init(dev);
+               }
+       }
+       mutex_unlock(&em28xx_extension_devlist_lock);
+
        return 0;
+
+fail_unreg:
+       em28xx_release_resources(dev);
+       mutex_unlock(&dev->lock);
+       kfree(dev);
+       return retval;
+}
+
+#if defined(CONFIG_MODULES) && defined(MODULE)
+static void request_module_async(struct work_struct *work)
+{
+       struct em28xx *dev = container_of(work,
+                            struct em28xx, request_module_wk);
+
+       if (dev->has_audio_class)
+               request_module("snd-usb-audio");
+       else
+               request_module("em28xx-alsa");
+
+       if (dev->has_dvb)
+               request_module("em28xx-dvb");
 }
 
+static void request_modules(struct em28xx *dev)
+{
+       INIT_WORK(&dev->request_module_wk, request_module_async);
+       schedule_work(&dev->request_module_wk);
+}
+#else
+#define request_modules(dev)
+#endif /* CONFIG_MODULES */
+
 /*
  * em28xx_usb_probe()
  * checks for supported devices
@@ -1772,22 +2099,24 @@ static int em28xx_usb_probe(struct usb_interface *interface,
        ifnum = interface->altsetting[0].desc.bInterfaceNumber;
 
        /* Check to see next free device and mark as used */
-       nr=find_first_zero_bit(&em28xx_devused,EM28XX_MAXBOARDS);
-       em28xx_devused|=1<<nr;
+       nr = find_first_zero_bit(&em28xx_devused, EM28XX_MAXBOARDS);
+       em28xx_devused |= 1<<nr;
 
        /* Don't register audio interfaces */
        if (interface->altsetting[0].desc.bInterfaceClass == USB_CLASS_AUDIO) {
                em28xx_err(DRIVER_NAME " audio device (%04x:%04x): interface %i, class %i\n",
-                               udev->descriptor.idVendor,udev->descriptor.idProduct,
+                               udev->descriptor.idVendor,
+                               udev->descriptor.idProduct,
                                ifnum,
                                interface->altsetting[0].desc.bInterfaceClass);
 
-               em28xx_devused&=~(1<<nr);
+               em28xx_devused &= ~(1<<nr);
                return -ENODEV;
        }
 
        em28xx_err(DRIVER_NAME " new video device (%04x:%04x): interface %i, class %i\n",
-                       udev->descriptor.idVendor,udev->descriptor.idProduct,
+                       udev->descriptor.idVendor,
+                       udev->descriptor.idProduct,
                        ifnum,
                        interface->altsetting[0].desc.bInterfaceClass);
 
@@ -1797,18 +2126,19 @@ static int em28xx_usb_probe(struct usb_interface *interface,
        if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=
            USB_ENDPOINT_XFER_ISOC) {
                em28xx_err(DRIVER_NAME " probing error: endpoint is non-ISO endpoint!\n");
-               em28xx_devused&=~(1<<nr);
+               em28xx_devused &= ~(1<<nr);
                return -ENODEV;
        }
        if ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT) {
                em28xx_err(DRIVER_NAME " probing error: endpoint is ISO OUT endpoint!\n");
-               em28xx_devused&=~(1<<nr);
+               em28xx_devused &= ~(1<<nr);
                return -ENODEV;
        }
 
        if (nr >= EM28XX_MAXBOARDS) {
-               printk (DRIVER_NAME ": Supports only %i em28xx boards.\n",EM28XX_MAXBOARDS);
-               em28xx_devused&=~(1<<nr);
+               printk(DRIVER_NAME ": Supports only %i em28xx boards.\n",
+                               EM28XX_MAXBOARDS);
+               em28xx_devused &= ~(1<<nr);
                return -ENOMEM;
        }
 
@@ -1816,25 +2146,38 @@ static int em28xx_usb_probe(struct usb_interface *interface,
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (dev == NULL) {
                em28xx_err(DRIVER_NAME ": out of memory!\n");
-               em28xx_devused&=~(1<<nr);
+               em28xx_devused &= ~(1<<nr);
                return -ENOMEM;
        }
 
        snprintf(dev->name, 29, "em28xx #%d", nr);
        dev->devno = nr;
        dev->model = id->driver_info;
+       dev->alt   = -1;
+
+       /* Checks if audio is provided by some interface */
+       for (i = 0; i < udev->config->desc.bNumInterfaces; i++) {
+               uif = udev->config->interface[i];
+               if (uif->altsetting[0].desc.bInterfaceClass == USB_CLASS_AUDIO) {
+                       dev->has_audio_class = 1;
+                       break;
+               }
+       }
+
+       printk(KERN_INFO DRIVER_NAME " %s usb audio class\n",
+                  dev->has_audio_class ? "Has" : "Doesn't have");
 
        /* compute alternate max packet sizes */
        uif = udev->actconfig->interface[0];
 
-       dev->num_alt=uif->num_altsetting;
-       em28xx_info("Alternate settings: %i\n",dev->num_alt);
-//     dev->alt_max_pkt_size = kmalloc(sizeof(*dev->alt_max_pkt_size)*
-       dev->alt_max_pkt_size = kmalloc(32*
-                                               dev->num_alt,GFP_KERNEL);
+       dev->num_alt = uif->num_altsetting;
+       em28xx_info("Alternate settings: %i\n", dev->num_alt);
+/*     dev->alt_max_pkt_size = kmalloc(sizeof(*dev->alt_max_pkt_size)* */
+       dev->alt_max_pkt_size = kmalloc(32 * dev->num_alt, GFP_KERNEL);
+
        if (dev->alt_max_pkt_size == NULL) {
                em28xx_errdev("out of memory!\n");
-               em28xx_devused&=~(1<<nr);
+               em28xx_devused &= ~(1<<nr);
                kfree(dev);
                return -ENOMEM;
        }
@@ -1844,11 +2187,11 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                                                        wMaxPacketSize);
                dev->alt_max_pkt_size[i] =
                    (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
-               em28xx_info("Alternate setting %i, max size= %i\n",i,
-                                                       dev->alt_max_pkt_size[i]);
+               em28xx_info("Alternate setting %i, max size= %i\n", i,
+                                               dev->alt_max_pkt_size[i]);
        }
 
-       if ((card[nr]>=0)&&(card[nr]<em28xx_bcount))
+       if ((card[nr] >= 0) && (card[nr] < em28xx_bcount))
                dev->model = card[nr];
 
        /* allocate device struct */
@@ -1860,6 +2203,9 @@ static int em28xx_usb_probe(struct usb_interface *interface,
 
        /* save our data pointer in this interface device */
        usb_set_intfdata(interface, dev);
+
+       request_modules(dev);
+
        return 0;
 }
 
@@ -1871,6 +2217,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
 static void em28xx_usb_disconnect(struct usb_interface *interface)
 {
        struct em28xx *dev;
+       struct em28xx_ops *ops = NULL;
 
        dev = usb_get_intfdata(interface);
        usb_set_intfdata(interface, NULL);
@@ -1880,7 +2227,8 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
 
        em28xx_info("disconnecting %s\n", dev->vdev->name);
 
-       /* wait until all current v4l2 io is finished then deallocate resources */
+       /* wait until all current v4l2 io is finished then deallocate
+          resources */
        mutex_lock(&dev->lock);
 
        wake_up_interruptible_all(&dev->open);
@@ -1900,15 +2248,20 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
                dev->state |= DEV_DISCONNECTED;
                em28xx_release_resources(dev);
        }
-
-
        mutex_unlock(&dev->lock);
 
+       mutex_lock(&em28xx_extension_devlist_lock);
+       if (!list_empty(&em28xx_extension_devlist)) {
+               list_for_each_entry(ops, &em28xx_extension_devlist, next) {
+                       ops->fini(dev);
+               }
+       }
+       mutex_unlock(&em28xx_extension_devlist_lock);
+
        if (!dev->users) {
                kfree(dev->alt_max_pkt_size);
                kfree(dev);
        }
-
 }
 
 static struct usb_driver em28xx_usb_driver = {