189 files changed, 14584 insertions, 8878 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 805c432c9439..ece958d3762e 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -112,6 +112,8 @@ source "drivers/auxdisplay/Kconfig"
 
 source "drivers/uio/Kconfig"
 
+source "drivers/vfio/Kconfig"
+
 source "drivers/vlynq/Kconfig"
 
 source "drivers/virtio/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index bd36f09f2246..5b421840c48d 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -60,6 +60,7 @@ obj-$(CONFIG_ATM)		+= atm/
 obj-$(CONFIG_FUSION)            += message/
 obj-y                           += firewire/
 obj-$(CONFIG_UIO)               += uio/
+obj-$(CONFIG_VFIO)              += vfio/
 obj-y                           += cdrom/
 obj-y                           += auxdisplay/
 obj-$(CONFIG_PCCARD)            += pcmcia/
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 8f428a8ab003..9917943a3572 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -55,8 +55,6 @@
 
 #define RBD_MINORS_PER_MAJOR    256             /* max minors per blkdev */
 
-#define RBD_MAX_MD_NAME_LEN     (RBD_MAX_OBJ_NAME_LEN + sizeof(RBD_SUFFIX))
-#define RBD_MAX_POOL_NAME_LEN   64
 #define RBD_MAX_SNAP_NAME_LEN   32
 #define RBD_MAX_OPT_LEN         1024
 
@@ -78,13 +76,12 @@
  */
 struct rbd_image_header {
         u64 image_size;
-        char block_name[32];
+        char *object_prefix;
         __u8 obj_order;
         __u8 crypt_type;
         __u8 comp_type;
         struct ceph_snap_context *snapc;
         size_t snap_names_len;
-        u64 snap_seq;
         u32 total_snaps;
 
         char *snap_names;
@@ -150,7 +147,7 @@ struct rbd_snap {
  * a single device
  */
 struct rbd_device {
-        int                     id;             /* blkdev unique id */
+        int                     dev_id;         /* blkdev unique id */
 
         int                     major;          /* blkdev assigned major */
         struct gendisk          *disk;          /* blkdev's gendisk and rq */
@@ -163,20 +160,24 @@ struct rbd_device {
         spinlock_t              lock;           /* queue lock */
 
         struct rbd_image_header header;
-        char                    obj[RBD_MAX_OBJ_NAME_LEN]; /* rbd image name */
-        int                     obj_len;
-        char                    obj_md_name[RBD_MAX_MD_NAME_LEN]; /* hdr nm. */
-        char                    pool_name[RBD_MAX_POOL_NAME_LEN];
-        int                     poolid;
+        char                    *image_name;
+        size_t                  image_name_len;
+        char                    *header_name;
+        char                    *pool_name;
+        int                     pool_id;
 
         struct ceph_osd_event   *watch_event;
         struct ceph_osd_request *watch_request;
 
         /* protects updating the header */
         struct rw_semaphore     header_rwsem;
-        char                    snap_name[RBD_MAX_SNAP_NAME_LEN];
+        /* name of the snapshot this device reads from */
+        char                    *snap_name;
+        /* id of the snapshot this device reads from */
         u64                     snap_id;        /* current snapshot id */
-        int read_only;
+        /* whether the snap_id this device reads from still exists */
+        bool                    snap_exists;
+        int                     read_only;
 
         struct list_head        node;
 
@@ -201,8 +202,7 @@ static ssize_t rbd_snap_add(struct device *dev,
                             struct device_attribute *attr,
                             const char *buf,
                             size_t count);
-static void __rbd_remove_snap_dev(struct rbd_device *rbd_dev,
-                                  struct rbd_snap *snap);
+static void __rbd_remove_snap_dev(struct rbd_snap *snap);
 
 static ssize_t rbd_add(struct bus_type *bus, const char *buf,
                        size_t count);
@@ -240,7 +240,7 @@ static void rbd_put_dev(struct rbd_device *rbd_dev)
         put_device(&rbd_dev->dev);
 }
 
-static int __rbd_refresh_header(struct rbd_device *rbd_dev);
+static int rbd_refresh_header(struct rbd_device *rbd_dev, u64 *hver);
 
 static int rbd_open(struct block_device *bdev, fmode_t mode)
 {
@@ -273,9 +273,9 @@ static const struct block_device_operations rbd_bd_ops = {
 
 /*
  * Initialize an rbd client instance.
- * We own *opt.
+ * We own *ceph_opts.
  */
-static struct rbd_client *rbd_client_create(struct ceph_options *opt,
+static struct rbd_client *rbd_client_create(struct ceph_options *ceph_opts,
                                             struct rbd_options *rbd_opts)
 {
         struct rbd_client *rbdc;
@@ -291,10 +291,10 @@ static struct rbd_client *rbd_client_create(struct ceph_options *opt,
 
         mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
 
-        rbdc->client = ceph_create_client(opt, rbdc, 0, 0);
+        rbdc->client = ceph_create_client(ceph_opts, rbdc, 0, 0);
         if (IS_ERR(rbdc->client))
                 goto out_mutex;
-        opt = NULL; /* Now rbdc->client is responsible for opt */
+        ceph_opts = NULL; /* Now rbdc->client is responsible for ceph_opts */
 
         ret = ceph_open_session(rbdc->client);
         if (ret < 0)
@@ -317,23 +317,23 @@ out_mutex:
         mutex_unlock(&ctl_mutex);
         kfree(rbdc);
 out_opt:
-        if (opt)
-                ceph_destroy_options(opt);
+        if (ceph_opts)
+                ceph_destroy_options(ceph_opts);
         return ERR_PTR(ret);
 }
 
 /*
  * Find a ceph client with specific addr and configuration.
  */
-static struct rbd_client *__rbd_client_find(struct ceph_options *opt)
+static struct rbd_client *__rbd_client_find(struct ceph_options *ceph_opts)
 {
         struct rbd_client *client_node;
 
-        if (opt->flags & CEPH_OPT_NOSHARE)
+        if (ceph_opts->flags & CEPH_OPT_NOSHARE)
                 return NULL;
 
         list_for_each_entry(client_node, &rbd_client_list, node)
-                if (ceph_compare_options(opt, client_node->client) == 0)
+                if (!ceph_compare_options(ceph_opts, client_node->client))
                         return client_node;
         return NULL;
 }
@@ -349,7 +349,7 @@ enum {
         /* string args above */
 };
 
-static match_table_t rbdopt_tokens = {
+static match_table_t rbd_opts_tokens = {
         {Opt_notify_timeout, "notify_timeout=%d"},
         /* int args above */
         /* string args above */
@@ -358,11 +358,11 @@ static match_table_t rbdopt_tokens = {
 
 static int parse_rbd_opts_token(char *c, void *private)
 {
-        struct rbd_options *rbdopt = private;
+        struct rbd_options *rbd_opts = private;
         substring_t argstr[MAX_OPT_ARGS];
         int token, intval, ret;
 
-        token = match_token(c, rbdopt_tokens, argstr);
+        token = match_token(c, rbd_opts_tokens, argstr);
         if (token < 0)
                 return -EINVAL;
 
@@ -383,7 +383,7 @@ static int parse_rbd_opts_token(char *c, void *private)
 
         switch (token) {
         case Opt_notify_timeout:
-                rbdopt->notify_timeout = intval;
+                rbd_opts->notify_timeout = intval;
                 break;
         default:
                 BUG_ON(token);
@@ -400,7 +400,7 @@ static struct rbd_client *rbd_get_client(const char *mon_addr,
                                          char *options)
 {
         struct rbd_client *rbdc;
-        struct ceph_options *opt;
+        struct ceph_options *ceph_opts;
         struct rbd_options *rbd_opts;
 
         rbd_opts = kzalloc(sizeof(*rbd_opts), GFP_KERNEL);
@@ -409,29 +409,29 @@ static struct rbd_client *rbd_get_client(const char *mon_addr,
 
         rbd_opts->notify_timeout = RBD_NOTIFY_TIMEOUT_DEFAULT;
 
-        opt = ceph_parse_options(options, mon_addr,
-                                mon_addr + mon_addr_len,
-                                parse_rbd_opts_token, rbd_opts);
-        if (IS_ERR(opt)) {
+        ceph_opts = ceph_parse_options(options, mon_addr,
+                                        mon_addr + mon_addr_len,
+                                        parse_rbd_opts_token, rbd_opts);
+        if (IS_ERR(ceph_opts)) {
                 kfree(rbd_opts);
-                return ERR_CAST(opt);
+                return ERR_CAST(ceph_opts);
         }
 
         spin_lock(&rbd_client_list_lock);
-        rbdc = __rbd_client_find(opt);
+        rbdc = __rbd_client_find(ceph_opts);
         if (rbdc) {
                 /* using an existing client */
                 kref_get(&rbdc->kref);
                 spin_unlock(&rbd_client_list_lock);
 
-                ceph_destroy_options(opt);
+                ceph_destroy_options(ceph_opts);
                 kfree(rbd_opts);
 
                 return rbdc;
         }
         spin_unlock(&rbd_client_list_lock);
 
-        rbdc = rbd_client_create(opt, rbd_opts);
+        rbdc = rbd_client_create(ceph_opts, rbd_opts);
 
         if (IS_ERR(rbdc))
                 kfree(rbd_opts);
@@ -480,46 +480,60 @@ static void rbd_coll_release(struct kref *kref)
         kfree(coll);
 }
 
+static bool rbd_dev_ondisk_valid(struct rbd_image_header_ondisk *ondisk)
+{
+        return !memcmp(&ondisk->text,
+                        RBD_HEADER_TEXT, sizeof (RBD_HEADER_TEXT));
+}
+
 /*
  * Create a new header structure, translate header format from the on-disk
  * header.
  */
 static int rbd_header_from_disk(struct rbd_image_header *header,
                                  struct rbd_image_header_ondisk *ondisk,
-                                 u32 allocated_snaps,
-                                 gfp_t gfp_flags)
+                                 u32 allocated_snaps)
 {
-        u32 i, snap_count;
+        u32 snap_count;
 
-        if (memcmp(ondisk, RBD_HEADER_TEXT, sizeof(RBD_HEADER_TEXT)))
+        if (!rbd_dev_ondisk_valid(ondisk))
                 return -ENXIO;
 
         snap_count = le32_to_cpu(ondisk->snap_count);
-        if (snap_count > (UINT_MAX - sizeof(struct ceph_snap_context))
-                         / sizeof (*ondisk))
+        if (snap_count > (SIZE_MAX - sizeof(struct ceph_snap_context))
+                                 / sizeof (u64))
                 return -EINVAL;
         header->snapc = kmalloc(sizeof(struct ceph_snap_context) +
                                 snap_count * sizeof(u64),
-                                gfp_flags);
+                                GFP_KERNEL);
         if (!header->snapc)
                 return -ENOMEM;
 
-        header->snap_names_len = le64_to_cpu(ondisk->snap_names_len);
         if (snap_count) {
+                header->snap_names_len = le64_to_cpu(ondisk->snap_names_len);
                 header->snap_names = kmalloc(header->snap_names_len,
-                                             gfp_flags);
+                                             GFP_KERNEL);
                 if (!header->snap_names)
                         goto err_snapc;
                 header->snap_sizes = kmalloc(snap_count * sizeof(u64),
-                                             gfp_flags);
+                                             GFP_KERNEL);
                 if (!header->snap_sizes)
                         goto err_names;
         } else {
+                WARN_ON(ondisk->snap_names_len);
+                header->snap_names_len = 0;
                 header->snap_names = NULL;
                 header->snap_sizes = NULL;
         }
-        memcpy(header->block_name, ondisk->block_name,
+
+        header->object_prefix = kmalloc(sizeof (ondisk->block_name) + 1,
+                                        GFP_KERNEL);
+        if (!header->object_prefix)
+                goto err_sizes;
+
+        memcpy(header->object_prefix, ondisk->block_name,
                sizeof(ondisk->block_name));
+        header->object_prefix[sizeof (ondisk->block_name)] = '\0';
 
         header->image_size = le64_to_cpu(ondisk->image_size);
         header->obj_order = ondisk->options.order;
@@ -527,11 +541,13 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
         header->comp_type = ondisk->options.comp_type;
 
         atomic_set(&header->snapc->nref, 1);
-        header->snap_seq = le64_to_cpu(ondisk->snap_seq);
+        header->snapc->seq = le64_to_cpu(ondisk->snap_seq);
         header->snapc->num_snaps = snap_count;
         header->total_snaps = snap_count;
 
         if (snap_count && allocated_snaps == snap_count) {
+                int i;
+
                 for (i = 0; i < snap_count; i++) {
                         header->snapc->snaps[i] =
                                 le64_to_cpu(ondisk->snaps[i].id);
@@ -540,16 +556,22 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
                 }
 
                 /* copy snapshot names */
-                memcpy(header->snap_names, &ondisk->snaps[i],
+                memcpy(header->snap_names, &ondisk->snaps[snap_count],
                         header->snap_names_len);
         }
 
         return 0;
 
+err_sizes:
+        kfree(header->snap_sizes);
+        header->snap_sizes = NULL;
 err_names:
         kfree(header->snap_names);
+        header->snap_names = NULL;
 err_snapc:
         kfree(header->snapc);
+        header->snapc = NULL;
+
         return -ENOMEM;
 }
 
@@ -575,52 +597,50 @@ static int snap_by_name(struct rbd_image_header *header, const char *snap_name,
         return -ENOENT;
 }
 
-static int rbd_header_set_snap(struct rbd_device *dev, u64 *size)
+static int rbd_header_set_snap(struct rbd_device *rbd_dev, u64 *size)
 {
-        struct rbd_image_header *header = &dev->header;
-        struct ceph_snap_context *snapc = header->snapc;
-        int ret = -ENOENT;
-
-        BUILD_BUG_ON(sizeof (dev->snap_name) < sizeof (RBD_SNAP_HEAD_NAME));
+        int ret;
 
-        down_write(&dev->header_rwsem);
+        down_write(&rbd_dev->header_rwsem);
 
-        if (!memcmp(dev->snap_name, RBD_SNAP_HEAD_NAME,
+        if (!memcmp(rbd_dev->snap_name, RBD_SNAP_HEAD_NAME,
                     sizeof (RBD_SNAP_HEAD_NAME))) {
-                if (header->total_snaps)
-                        snapc->seq = header->snap_seq;
-                else
-                        snapc->seq = 0;
-                dev->snap_id = CEPH_NOSNAP;
-                dev->read_only = 0;
+                rbd_dev->snap_id = CEPH_NOSNAP;
+                rbd_dev->snap_exists = false;
+                rbd_dev->read_only = 0;
                 if (size)
-                        *size = header->image_size;
+                        *size = rbd_dev->header.image_size;
         } else {
-                ret = snap_by_name(header, dev->snap_name, &snapc->seq, size);
+                u64 snap_id = 0;
+
+                ret = snap_by_name(&rbd_dev->header, rbd_dev->snap_name,
+                                        &snap_id, size);
                 if (ret < 0)
                         goto done;
-                dev->snap_id = snapc->seq;
-                dev->read_only = 1;
+                rbd_dev->snap_id = snap_id;
+                rbd_dev->snap_exists = true;
+                rbd_dev->read_only = 1;
         }
 
         ret = 0;
 done:
-        up_write(&dev->header_rwsem);
+        up_write(&rbd_dev->header_rwsem);
         return ret;
 }
 
 static void rbd_header_free(struct rbd_image_header *header)
 {
-        kfree(header->snapc);
-        kfree(header->snap_names);
+        kfree(header->object_prefix);
         kfree(header->snap_sizes);
+        kfree(header->snap_names);
+        ceph_put_snap_context(header->snapc);
 }
 
 /*
  * get the actual striped segment name, offset and length
  */
 static u64 rbd_get_segment(struct rbd_image_header *header,
-                           const char *block_name,
+                           const char *object_prefix,
                            u64 ofs, u64 len,
                            char *seg_name, u64 *segofs)
 {
@@ -628,7 +648,7 @@ static u64 rbd_get_segment(struct rbd_image_header *header,
 
         if (seg_name)
                 snprintf(seg_name, RBD_MAX_SEG_NAME_LEN,
-                         "%s.%012llx", block_name, seg);
+                         "%s.%012llx", object_prefix, seg);
 
         ofs = ofs & ((1 << header->obj_order) - 1);
         len = min_t(u64, len, (1 << header->obj_order) - ofs);
@@ -726,9 +746,8 @@ static struct bio *bio_chain_clone(struct bio **old, struct bio **next,
                          * split_bio will BUG_ON if this is not the case
                          */
                         dout("bio_chain_clone split! total=%d remaining=%d"
-                             "bi_size=%d\n",
-                             (int)total, (int)len-total,
-                             (int)old_chain->bi_size);
+                             "bi_size=%u\n",
+                             total, len - total, old_chain->bi_size);
 
                         /* split the bio. We'll release it either in the next
                            call, or it will have to be released outside */
@@ -777,22 +796,24 @@ err_out:
 /*
  * helpers for osd request op vectors.
  */
-static int rbd_create_rw_ops(struct ceph_osd_req_op **ops,
-                            int num_ops,
-                            int opcode,
-                            u32 payload_len)
-{
-        *ops = kzalloc(sizeof(struct ceph_osd_req_op) * (num_ops + 1),
-                       GFP_NOIO);
-        if (!*ops)
-                return -ENOMEM;
-        (*ops)[0].op = opcode;
+static struct ceph_osd_req_op *rbd_create_rw_ops(int num_ops,
+                                        int opcode, u32 payload_len)
+{
+        struct ceph_osd_req_op *ops;
+
+        ops = kzalloc(sizeof (*ops) * (num_ops + 1), GFP_NOIO);
+        if (!ops)
+                return NULL;
+
+        ops[0].op = opcode;
+
         /*
          * op extent offset and length will be set later on
          * in calc_raw_layout()
          */
-        (*ops)[0].payload_len = payload_len;
-        return 0;
+        ops[0].payload_len = payload_len;
+
+        return ops;
 }
 
 static void rbd_destroy_ops(struct ceph_osd_req_op *ops)
@@ -808,8 +829,8 @@ static void rbd_coll_end_req_index(struct request *rq,
         struct request_queue *q;
         int min, max, i;
 
-        dout("rbd_coll_end_req_index %p index %d ret %d len %lld\n",
-             coll, index, ret, len);
+        dout("rbd_coll_end_req_index %p index %d ret %d len %llu\n",
+             coll, index, ret, (unsigned long long) len);
 
         if (!rq)
                 return;
@@ -848,16 +869,15 @@ static void rbd_coll_end_req(struct rbd_request *req,
  * Send ceph osd request
  */
 static int rbd_do_request(struct request *rq,
-                          struct rbd_device *dev,
+                          struct rbd_device *rbd_dev,
                           struct ceph_snap_context *snapc,
                           u64 snapid,
-                          const char *obj, u64 ofs, u64 len,
+                          const char *object_name, u64 ofs, u64 len,
                           struct bio *bio,
                           struct page **pages,
                           int num_pages,
                           int flags,
                           struct ceph_osd_req_op *ops,
-                          int num_reply,
                           struct rbd_req_coll *coll,
                           int coll_index,
                           void (*rbd_cb)(struct ceph_osd_request *req,
@@ -887,15 +907,13 @@ static int rbd_do_request(struct request *rq,
                 req_data->coll_index = coll_index;
         }
 
-        dout("rbd_do_request obj=%s ofs=%lld len=%lld\n", obj, len, ofs);
-
-        down_read(&dev->header_rwsem);
+        dout("rbd_do_request object_name=%s ofs=%llu len=%llu\n", object_name,
+                (unsigned long long) ofs, (unsigned long long) len);
 
-        osdc = &dev->rbd_client->client->osdc;
+        osdc = &rbd_dev->rbd_client->client->osdc;
         req = ceph_osdc_alloc_request(osdc, flags, snapc, ops,
                                         false, GFP_NOIO, pages, bio);
         if (!req) {
-                up_read(&dev->header_rwsem);
                 ret = -ENOMEM;
                 goto done_pages;
         }
@@ -912,7 +930,7 @@ static int rbd_do_request(struct request *rq,
         reqhead = req->r_request->front.iov_base;
         reqhead->snapid = cpu_to_le64(CEPH_NOSNAP);
 
-        strncpy(req->r_oid, obj, sizeof(req->r_oid));
+        strncpy(req->r_oid, object_name, sizeof(req->r_oid));
         req->r_oid_len = strlen(req->r_oid);
 
         layout = &req->r_file_layout;
@@ -920,7 +938,7 @@ static int rbd_do_request(struct request *rq,
         layout->fl_stripe_unit = cpu_to_le32(1 << RBD_MAX_OBJ_ORDER);
         layout->fl_stripe_count = cpu_to_le32(1);
         layout->fl_object_size = cpu_to_le32(1 << RBD_MAX_OBJ_ORDER);
-        layout->fl_pg_pool = cpu_to_le32(dev->poolid);
+        layout->fl_pg_pool = cpu_to_le32(rbd_dev->pool_id);
         ceph_calc_raw_layout(osdc, layout, snapid, ofs, &len, &bno,
                                 req, ops);
 
@@ -929,7 +947,6 @@ static int rbd_do_request(struct request *rq,
                                 snapc,
                                 &mtime,
                                 req->r_oid, req->r_oid_len);
-        up_read(&dev->header_rwsem);
 
         if (linger_req) {
                 ceph_osdc_set_request_linger(osdc, req);
@@ -944,8 +961,9 @@ static int rbd_do_request(struct request *rq,
                 ret = ceph_osdc_wait_request(osdc, req);
                 if (ver)
                         *ver = le64_to_cpu(req->r_reassert_version.version);
-                dout("reassert_ver=%lld\n",
-                     le64_to_cpu(req->r_reassert_version.version));
+                dout("reassert_ver=%llu\n",
+                        (unsigned long long)
+                                le64_to_cpu(req->r_reassert_version.version));
                 ceph_osdc_put_request(req);
         }
         return ret;
@@ -979,7 +997,8 @@ static void rbd_req_cb(struct ceph_osd_request *req, struct ceph_msg *msg)
         bytes = le64_to_cpu(op->extent.length);
         read_op = (le16_to_cpu(op->op) == CEPH_OSD_OP_READ);
 
-        dout("rbd_req_cb bytes=%lld readop=%d rc=%d\n", bytes, read_op, rc);
+        dout("rbd_req_cb bytes=%llu readop=%d rc=%d\n",
+                (unsigned long long) bytes, read_op, (int) rc);
 
         if (rc == -ENOENT && read_op) {
                 zero_bio_chain(req_data->bio, 0);
@@ -1006,14 +1025,12 @@ static void rbd_simple_req_cb(struct ceph_osd_request *req, struct ceph_msg *msg
 /*
  * Do a synchronous ceph osd operation
  */
-static int rbd_req_sync_op(struct rbd_device *dev,
+static int rbd_req_sync_op(struct rbd_device *rbd_dev,
                            struct ceph_snap_context *snapc,
                            u64 snapid,
-                           int opcode,
                            int flags,
-                           struct ceph_osd_req_op *orig_ops,
-                           int num_reply,
-                           const char *obj,
+                           struct ceph_osd_req_op *ops,
+                           const char *object_name,
                            u64 ofs, u64 len,
                            char *buf,
                            struct ceph_osd_request **linger_req,
@@ -1022,45 +1039,28 @@ static int rbd_req_sync_op(struct rbd_device *dev,
         int ret;
         struct page **pages;
         int num_pages;
-        struct ceph_osd_req_op *ops = orig_ops;
-        u32 payload_len;
+
+        BUG_ON(ops == NULL);
 
         num_pages = calc_pages_for(ofs , len);
         pages = ceph_alloc_page_vector(num_pages, GFP_KERNEL);
         if (IS_ERR(pages))
                 return PTR_ERR(pages);
 
-        if (!orig_ops) {
-                payload_len = (flags & CEPH_OSD_FLAG_WRITE ? len : 0);
-                ret = rbd_create_rw_ops(&ops, 1, opcode, payload_len);
-                if (ret < 0)
-                        goto done;
-
-                if ((flags & CEPH_OSD_FLAG_WRITE) && buf) {
-                        ret = ceph_copy_to_page_vector(pages, buf, ofs, len);
-                        if (ret < 0)
-                                goto done_ops;
-                }
-        }
-
-        ret = rbd_do_request(NULL, dev, snapc, snapid,
-                          obj, ofs, len, NULL,
+        ret = rbd_do_request(NULL, rbd_dev, snapc, snapid,
+                          object_name, ofs, len, NULL,
                           pages, num_pages,
                           flags,
                           ops,
-                          2,
                           NULL, 0,
                           NULL,
                           linger_req, ver);
         if (ret < 0)
-                goto done_ops;
+                goto done;
 
         if ((flags & CEPH_OSD_FLAG_READ) && buf)
                 ret = ceph_copy_from_page_vector(pages, buf, ofs, ret);
 
-done_ops:
-        if (!orig_ops)
-                rbd_destroy_ops(ops);
 done:
         ceph_release_page_vector(pages, num_pages);
         return ret;
@@ -1070,10 +1070,10 @@ done:
  * Do an asynchronous ceph osd operation
  */
 static int rbd_do_op(struct request *rq,
-                     struct rbd_device *rbd_dev ,
+                     struct rbd_device *rbd_dev,
                      struct ceph_snap_context *snapc,
                      u64 snapid,
-                     int opcode, int flags, int num_reply,
+                     int opcode, int flags,
                      u64 ofs, u64 len,
                      struct bio *bio,
                      struct rbd_req_coll *coll,
@@ -1091,14 +1091,15 @@ static int rbd_do_op(struct request *rq,
                 return -ENOMEM;
 
         seg_len = rbd_get_segment(&rbd_dev->header,
-                                  rbd_dev->header.block_name,
+                                  rbd_dev->header.object_prefix,
                                   ofs, len,
                                   seg_name, &seg_ofs);
 
         payload_len = (flags & CEPH_OSD_FLAG_WRITE ? seg_len : 0);
 
-        ret = rbd_create_rw_ops(&ops, 1, opcode, payload_len);
-        if (ret < 0)
+        ret = -ENOMEM;
+        ops = rbd_create_rw_ops(1, opcode, payload_len);
+        if (!ops)
                 goto done;
 
         /* we've taken care of segment sizes earlier when we
@@ -1112,7 +1113,6 @@ static int rbd_do_op(struct request *rq,
                              NULL, 0,
                              flags,
                              ops,
-                             num_reply,
                              coll, coll_index,
                              rbd_req_cb, 0, NULL);
 
@@ -1136,7 +1136,6 @@ static int rbd_req_write(struct request *rq,
         return rbd_do_op(rq, rbd_dev, snapc, CEPH_NOSNAP,
                          CEPH_OSD_OP_WRITE,
                          CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
-                         2,
                          ofs, len, bio, coll, coll_index);
 }
 
@@ -1155,55 +1154,58 @@ static int rbd_req_read(struct request *rq,
                          snapid,
                          CEPH_OSD_OP_READ,
                          CEPH_OSD_FLAG_READ,
-                         2,
                          ofs, len, bio, coll, coll_index);
 }
 
 /*
  * Request sync osd read
  */
-static int rbd_req_sync_read(struct rbd_device *dev,
-                          struct ceph_snap_context *snapc,
+static int rbd_req_sync_read(struct rbd_device *rbd_dev,
                           u64 snapid,
-                          const char *obj,
+                          const char *object_name,
                           u64 ofs, u64 len,
                           char *buf,
                           u64 *ver)
 {
-        return rbd_req_sync_op(dev, NULL,
+        struct ceph_osd_req_op *ops;
+        int ret;
+
+        ops = rbd_create_rw_ops(1, CEPH_OSD_OP_READ, 0);
+        if (!ops)
+                return -ENOMEM;
+
+        ret = rbd_req_sync_op(rbd_dev, NULL,
                                snapid,
-                               CEPH_OSD_OP_READ,
                                CEPH_OSD_FLAG_READ,
-                               NULL,
-                               1, obj, ofs, len, buf, NULL, ver);
+                               ops, object_name, ofs, len, buf, NULL, ver);
+        rbd_destroy_ops(ops);
+
+        return ret;
 }
 
 /*
  * Request sync osd watch
  */
-static int rbd_req_sync_notify_ack(struct rbd_device *dev,
+static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev,
                                    u64 ver,
-                                   u64 notify_id,
-                                   const char *obj)
+                                   u64 notify_id)
 {
         struct ceph_osd_req_op *ops;
-        struct page **pages = NULL;
         int ret;
 
-        ret = rbd_create_rw_ops(&ops, 1, CEPH_OSD_OP_NOTIFY_ACK, 0);
-        if (ret < 0)
-                return ret;
+        ops = rbd_create_rw_ops(1, CEPH_OSD_OP_NOTIFY_ACK, 0);
+        if (!ops)
+                return -ENOMEM;
 
-        ops[0].watch.ver = cpu_to_le64(dev->header.obj_version);
+        ops[0].watch.ver = cpu_to_le64(ver);
         ops[0].watch.cookie = notify_id;
         ops[0].watch.flag = 0;
 
-        ret = rbd_do_request(NULL, dev, NULL, CEPH_NOSNAP,
-                          obj, 0, 0, NULL,
-                          pages, 0,
+        ret = rbd_do_request(NULL, rbd_dev, NULL, CEPH_NOSNAP,
+                          rbd_dev->header_name, 0, 0, NULL,
+                          NULL, 0,
                           CEPH_OSD_FLAG_READ,
                           ops,
-                          1,
                           NULL, 0,
                           rbd_simple_req_cb, 0, NULL);
 
@@ -1213,54 +1215,53 @@ static int rbd_req_sync_notify_ack(struct rbd_device *dev,
 
 static void rbd_watch_cb(u64 ver, u64 notify_id, u8 opcode, void *data)
 {
-        struct rbd_device *dev = (struct rbd_device *)data;
+        struct rbd_device *rbd_dev = (struct rbd_device *)data;
+        u64 hver;
         int rc;
 
-        if (!dev)
+        if (!rbd_dev)
                 return;
 
-        dout("rbd_watch_cb %s notify_id=%lld opcode=%d\n", dev->obj_md_name,
-                notify_id, (int)opcode);
-        mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
-        rc = __rbd_refresh_header(dev);
-        mutex_unlock(&ctl_mutex);
+        dout("rbd_watch_cb %s notify_id=%llu opcode=%u\n",
+                rbd_dev->header_name, (unsigned long long) notify_id,
+                (unsigned int) opcode);
+        rc = rbd_refresh_header(rbd_dev, &hver);
         if (rc)
                 pr_warning(RBD_DRV_NAME "%d got notification but failed to "
-                           " update snaps: %d\n", dev->major, rc);
+                           " update snaps: %d\n", rbd_dev->major, rc);
 
-        rbd_req_sync_notify_ack(dev, ver, notify_id, dev->obj_md_name);
+        rbd_req_sync_notify_ack(rbd_dev, hver, notify_id);
 }
 
 /*
  * Request sync osd watch
  */
-static int rbd_req_sync_watch(struct rbd_device *dev,
-                              const char *obj,
-                              u64 ver)
+static int rbd_req_sync_watch(struct rbd_device *rbd_dev)
 {
         struct ceph_osd_req_op *ops;
-        struct ceph_osd_client *osdc = &dev->rbd_client->client->osdc;
+        struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc;
+        int ret;
 
-        int ret = rbd_create_rw_ops(&ops, 1, CEPH_OSD_OP_WATCH, 0);
-        if (ret < 0)
-                return ret;
+        ops = rbd_create_rw_ops(1, CEPH_OSD_OP_WATCH, 0);
+        if (!ops)
+                return -ENOMEM;
 
         ret = ceph_osdc_create_event(osdc, rbd_watch_cb, 0,
-                                     (void *)dev, &dev->watch_event);
+                                     (void *)rbd_dev, &rbd_dev->watch_event);
         if (ret < 0)
                 goto fail;
 
-        ops[0].watch.ver = cpu_to_le64(ver);
-        ops[0].watch.cookie = cpu_to_le64(dev->watch_event->cookie);
+        ops[0].watch.ver = cpu_to_le64(rbd_dev->header.obj_version);
+        ops[0].watch.cookie = cpu_to_le64(rbd_dev->watch_event->cookie);
         ops[0].watch.flag = 1;
 
-        ret = rbd_req_sync_op(dev, NULL,
+        ret = rbd_req_sync_op(rbd_dev, NULL,
                               CEPH_NOSNAP,
-                              0,
                               CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
                               ops,
-                              1, obj, 0, 0, NULL,
-                              &dev->watch_request, NULL);
+                              rbd_dev->header_name,
+                              0, 0, NULL,
+                              &rbd_dev->watch_request, NULL);
 
         if (ret < 0)
                 goto fail_event;
@@ -1269,8 +1270,8 @@ static int rbd_req_sync_watch(struct rbd_device *dev,
         return 0;
 
 fail_event:
-        ceph_osdc_cancel_event(dev->watch_event);
-        dev->watch_event = NULL;
+        ceph_osdc_cancel_event(rbd_dev->watch_event);
+        rbd_dev->watch_event = NULL;
 fail:
         rbd_destroy_ops(ops);
         return ret;
@@ -1279,64 +1280,65 @@ fail:
 /*
  * Request sync osd unwatch
  */
-static int rbd_req_sync_unwatch(struct rbd_device *dev,
-                                const char *obj)
+static int rbd_req_sync_unwatch(struct rbd_device *rbd_dev)
 {
         struct ceph_osd_req_op *ops;
+        int ret;
 
-        int ret = rbd_create_rw_ops(&ops, 1, CEPH_OSD_OP_WATCH, 0);
-        if (ret < 0)
-                return ret;
+        ops = rbd_create_rw_ops(1, CEPH_OSD_OP_WATCH, 0);
+        if (!ops)
+                return -ENOMEM;
 
         ops[0].watch.ver = 0;
-        ops[0].watch.cookie = cpu_to_le64(dev->watch_event->cookie);
+        ops[0].watch.cookie = cpu_to_le64(rbd_dev->watch_event->cookie);
         ops[0].watch.flag = 0;
 
-        ret = rbd_req_sync_op(dev, NULL,
+        ret = rbd_req_sync_op(rbd_dev, NULL,
                               CEPH_NOSNAP,
-                              0,
                               CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
                               ops,
-                              1, obj, 0, 0, NULL, NULL, NULL);
+                              rbd_dev->header_name,
+                              0, 0, NULL, NULL, NULL);
+
 
         rbd_destroy_ops(ops);
-        ceph_osdc_cancel_event(dev->watch_event);
-        dev->watch_event = NULL;
+        ceph_osdc_cancel_event(rbd_dev->watch_event);
+        rbd_dev->watch_event = NULL;
         return ret;
 }
 
 struct rbd_notify_info {
-        struct rbd_device *dev;
+        struct rbd_device *rbd_dev;
 };
 
 static void rbd_notify_cb(u64 ver, u64 notify_id, u8 opcode, void *data)
 {
-        struct rbd_device *dev = (struct rbd_device *)data;
-        if (!dev)
+        struct rbd_device *rbd_dev = (struct rbd_device *)data;
+        if (!rbd_dev)
                 return;
 
-        dout("rbd_notify_cb %s notify_id=%lld opcode=%d\n", dev->obj_md_name,
-                notify_id, (int)opcode);
+        dout("rbd_notify_cb %s notify_id=%llu opcode=%u\n",
+                        rbd_dev->header_name, (unsigned long long) notify_id,
+                        (unsigned int) opcode);
 }
 
 /*
  * Request sync osd notify
  */
-static int rbd_req_sync_notify(struct rbd_device *dev,
-                          const char *obj)
+static int rbd_req_sync_notify(struct rbd_device *rbd_dev)
 {
         struct ceph_osd_req_op *ops;
-        struct ceph_osd_client *osdc = &dev->rbd_client->client->osdc;
+        struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc;
         struct ceph_osd_event *event;
         struct rbd_notify_info info;
         int payload_len = sizeof(u32) + sizeof(u32);
         int ret;
 
-        ret = rbd_create_rw_ops(&ops, 1, CEPH_OSD_OP_NOTIFY, payload_len);
-        if (ret < 0)
-                return ret;
+        ops = rbd_create_rw_ops(1, CEPH_OSD_OP_NOTIFY, payload_len);
+        if (!ops)
+                return -ENOMEM;
 
-        info.dev = dev;
+        info.rbd_dev = rbd_dev;
 
         ret = ceph_osdc_create_event(osdc, rbd_notify_cb, 1,
                                      (void *)&info, &event);
@@ -1349,12 +1351,12 @@ static int rbd_req_sync_notify(struct rbd_device *dev,
         ops[0].watch.prot_ver = RADOS_NOTIFY_VER;
         ops[0].watch.timeout = 12;
 
-        ret = rbd_req_sync_op(dev, NULL,
+        ret = rbd_req_sync_op(rbd_dev, NULL,
                                CEPH_NOSNAP,
-                               0,
                                CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
                                ops,
-                               1, obj, 0, 0, NULL, NULL, NULL);
+                               rbd_dev->header_name,
+                               0, 0, NULL, NULL, NULL);
         if (ret < 0)
                 goto fail_event;
 
@@ -1373,36 +1375,37 @@ fail:
 /*
  * Request sync osd read
  */
-static int rbd_req_sync_exec(struct rbd_device *dev,
-                             const char *obj,
-                             const char *cls,
-                             const char *method,
+static int rbd_req_sync_exec(struct rbd_device *rbd_dev,
+                             const char *object_name,
+                             const char *class_name,
+                             const char *method_name,
                              const char *data,
                              int len,
                              u64 *ver)
 {
         struct ceph_osd_req_op *ops;
-        int cls_len = strlen(cls);
-        int method_len = strlen(method);
-        int ret = rbd_create_rw_ops(&ops, 1, CEPH_OSD_OP_CALL,
-                                    cls_len + method_len + len);
-        if (ret < 0)
-                return ret;
+        int class_name_len = strlen(class_name);
+        int method_name_len = strlen(method_name);
+        int ret;
 
-        ops[0].cls.class_name = cls;
-        ops[0].cls.class_len = (__u8)cls_len;
-        ops[0].cls.method_name = method;
-        ops[0].cls.method_len = (__u8)method_len;
+        ops = rbd_create_rw_ops(1, CEPH_OSD_OP_CALL,
+                                    class_name_len + method_name_len + len);
+        if (!ops)
+                return -ENOMEM;
+
+        ops[0].cls.class_name = class_name;
+        ops[0].cls.class_len = (__u8) class_name_len;
+        ops[0].cls.method_name = method_name;
+        ops[0].cls.method_len = (__u8) method_name_len;
         ops[0].cls.argc = 0;
         ops[0].cls.indata = data;
         ops[0].cls.indata_len = len;
 
-        ret = rbd_req_sync_op(dev, NULL,
+        ret = rbd_req_sync_op(rbd_dev, NULL,
                                CEPH_NOSNAP,
-                               0,
                                CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
                                ops,
-                               1, obj, 0, 0, NULL, NULL, ver);
+                               object_name, 0, 0, NULL, NULL, ver);
 
         rbd_destroy_ops(ops);
 
@@ -1437,10 +1440,12 @@ static void rbd_rq_fn(struct request_queue *q)
                 struct bio *bio;
                 struct bio *rq_bio, *next_bio = NULL;
                 bool do_write;
-                int size, op_size = 0;
+                unsigned int size;
+                u64 op_size = 0;
                 u64 ofs;
                 int num_segs, cur_seg = 0;
                 struct rbd_req_coll *coll;
+                struct ceph_snap_context *snapc;
 
                 /* peek at request from block layer */
                 if (!rq)
@@ -1467,23 +1472,38 @@ static void rbd_rq_fn(struct request_queue *q)
 
                 spin_unlock_irq(q->queue_lock);
 
+                down_read(&rbd_dev->header_rwsem);
+
+                if (rbd_dev->snap_id != CEPH_NOSNAP && !rbd_dev->snap_exists) {
+                        up_read(&rbd_dev->header_rwsem);
+                        dout("request for non-existent snapshot");
+                        spin_lock_irq(q->queue_lock);
+                        __blk_end_request_all(rq, -ENXIO);
+                        continue;
+                }
+
+                snapc = ceph_get_snap_context(rbd_dev->header.snapc);
+
+                up_read(&rbd_dev->header_rwsem);
+
                 dout("%s 0x%x bytes at 0x%llx\n",
                      do_write ? "write" : "read",
-                     size, blk_rq_pos(rq) * SECTOR_SIZE);
+                     size, (unsigned long long) blk_rq_pos(rq) * SECTOR_SIZE);
 
                 num_segs = rbd_get_num_segments(&rbd_dev->header, ofs, size);
                 coll = rbd_alloc_coll(num_segs);
                 if (!coll) {
                         spin_lock_irq(q->queue_lock);
                         __blk_end_request_all(rq, -ENOMEM);
+                        ceph_put_snap_context(snapc);
                         continue;
                 }
 
                 do {
                         /* a bio clone to be passed down to OSD req */
-                        dout("rq->bio->bi_vcnt=%d\n", rq->bio->bi_vcnt);
+                        dout("rq->bio->bi_vcnt=%hu\n", rq->bio->bi_vcnt);
                         op_size = rbd_get_segment(&rbd_dev->header,
-                                                  rbd_dev->header.block_name,
+                                                  rbd_dev->header.object_prefix,
                                                   ofs, size,
                                                   NULL, NULL);
                         kref_get(&coll->kref);
@@ -1499,7 +1519,7 @@ static void rbd_rq_fn(struct request_queue *q)
                         /* init OSD command: write or read */
                         if (do_write)
                                 rbd_req_write(rq, rbd_dev,
-                                              rbd_dev->header.snapc,
+                                              snapc,
                                               ofs,
                                               op_size, bio,
                                               coll, cur_seg);
@@ -1522,6 +1542,8 @@ next_seg:
                 if (bp)
                         bio_pair_release(bp);
                 spin_lock_irq(q->queue_lock);
+
+                ceph_put_snap_context(snapc);
         }
 }
 
@@ -1592,18 +1614,19 @@ static int rbd_read_header(struct rbd_device *rbd_dev,
                         return -ENOMEM;
 
                 rc = rbd_req_sync_read(rbd_dev,
-                                       NULL, CEPH_NOSNAP,
-                                       rbd_dev->obj_md_name,
+                                       CEPH_NOSNAP,
+                                       rbd_dev->header_name,
                                        0, len,
                                        (char *)dh, &ver);
                 if (rc < 0)
                         goto out_dh;
 
-                rc = rbd_header_from_disk(header, dh, snap_count, GFP_KERNEL);
+                rc = rbd_header_from_disk(header, dh, snap_count);
                 if (rc < 0) {
                         if (rc == -ENXIO)
                                 pr_warning("unrecognized header format"
-                                           " for image %s", rbd_dev->obj);
+                                           " for image %s\n",
+                                           rbd_dev->image_name);
                         goto out_dh;
                 }
 
@@ -1628,7 +1651,7 @@ out_dh:
 /*
  * create a snapshot
  */
-static int rbd_header_add_snap(struct rbd_device *dev,
+static int rbd_header_add_snap(struct rbd_device *rbd_dev,
                                const char *snap_name,
                                gfp_t gfp_flags)
 {
@@ -1636,16 +1659,15 @@ static int rbd_header_add_snap(struct rbd_device *dev,
         u64 new_snapid;
         int ret;
         void *data, *p, *e;
-        u64 ver;
         struct ceph_mon_client *monc;
 
         /* we should create a snapshot only if we're pointing at the head */
-        if (dev->snap_id != CEPH_NOSNAP)
+        if (rbd_dev->snap_id != CEPH_NOSNAP)
                 return -EINVAL;
 
-        monc = &dev->rbd_client->client->monc;
-        ret = ceph_monc_create_snapid(monc, dev->poolid, &new_snapid);
-        dout("created snapid=%lld\n", new_snapid);
+        monc = &rbd_dev->rbd_client->client->monc;
+        ret = ceph_monc_create_snapid(monc, rbd_dev->pool_id, &new_snapid);
+        dout("created snapid=%llu\n", (unsigned long long) new_snapid);
         if (ret < 0)
                 return ret;
 
@@ -1659,19 +1681,13 @@ static int rbd_header_add_snap(struct rbd_device *dev,
         ceph_encode_string_safe(&p, e, snap_name, name_len, bad);
         ceph_encode_64_safe(&p, e, new_snapid, bad);
 
-        ret = rbd_req_sync_exec(dev, dev->obj_md_name, "rbd", "snap_add",
-                                data, p - data, &ver);
+        ret = rbd_req_sync_exec(rbd_dev, rbd_dev->header_name,
+                                "rbd", "snap_add",
+                                data, p - data, NULL);
 
         kfree(data);
 
-        if (ret < 0)
-                return ret;
-
-        down_write(&dev->header_rwsem);
-        dev->header.snapc->seq = new_snapid;
-        up_write(&dev->header_rwsem);
-
-        return 0;
+        return ret < 0 ? ret : 0;
 bad:
         return -ERANGE;
 }
@@ -1679,52 +1695,52 @@ bad:
 static void __rbd_remove_all_snaps(struct rbd_device *rbd_dev)
 {
         struct rbd_snap *snap;
+        struct rbd_snap *next;
 
-        while (!list_empty(&rbd_dev->snaps)) {
-                snap = list_first_entry(&rbd_dev->snaps, struct rbd_snap, node);
-                __rbd_remove_snap_dev(rbd_dev, snap);
-        }
+        list_for_each_entry_safe(snap, next, &rbd_dev->snaps, node)
+                __rbd_remove_snap_dev(snap);
 }
 
 /*
  * only read the first part of the ondisk header, without the snaps info
  */
-static int __rbd_refresh_header(struct rbd_device *rbd_dev)
+static int __rbd_refresh_header(struct rbd_device *rbd_dev, u64 *hver)
 {
         int ret;
         struct rbd_image_header h;
-        u64 snap_seq;
-        int follow_seq = 0;
 
         ret = rbd_read_header(rbd_dev, &h);
         if (ret < 0)
                 return ret;
 
-        /* resized? */
-        set_capacity(rbd_dev->disk, h.image_size / SECTOR_SIZE);
-
         down_write(&rbd_dev->header_rwsem);
 
-        snap_seq = rbd_dev->header.snapc->seq;
-        if (rbd_dev->header.total_snaps &&
-            rbd_dev->header.snapc->snaps[0] == snap_seq)
-                /* pointing at the head, will need to follow that
-                   if head moves */
-                follow_seq = 1;
+        /* resized? */
+        if (rbd_dev->snap_id == CEPH_NOSNAP) {
+                sector_t size = (sector_t) h.image_size / SECTOR_SIZE;
 
-        kfree(rbd_dev->header.snapc);
-        kfree(rbd_dev->header.snap_names);
+                dout("setting size to %llu sectors", (unsigned long long) size);
+                set_capacity(rbd_dev->disk, size);
+        }
+
+        /* rbd_dev->header.object_prefix shouldn't change */
         kfree(rbd_dev->header.snap_sizes);
+        kfree(rbd_dev->header.snap_names);
+        /* osd requests may still refer to snapc */
+        ceph_put_snap_context(rbd_dev->header.snapc);
 
+        if (hver)
+                *hver = h.obj_version;
+        rbd_dev->header.obj_version = h.obj_version;
+        rbd_dev->header.image_size = h.image_size;
         rbd_dev->header.total_snaps = h.total_snaps;
         rbd_dev->header.snapc = h.snapc;
         rbd_dev->header.snap_names = h.snap_names;
         rbd_dev->header.snap_names_len = h.snap_names_len;
         rbd_dev->header.snap_sizes = h.snap_sizes;
-        if (follow_seq)
-                rbd_dev->header.snapc->seq = rbd_dev->header.snapc->snaps[0];
-        else
-                rbd_dev->header.snapc->seq = snap_seq;
+        /* Free the extra copy of the object prefix */
+        WARN_ON(strcmp(rbd_dev->header.object_prefix, h.object_prefix));
+        kfree(h.object_prefix);
 
         ret = __rbd_init_snaps_header(rbd_dev);
 
@@ -1733,6 +1749,17 @@ static int __rbd_refresh_header(struct rbd_device *rbd_dev)
         return ret;
 }
 
+static int rbd_refresh_header(struct rbd_device *rbd_dev, u64 *hver)
+{
+        int ret;
+
+        mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
+        ret = __rbd_refresh_header(rbd_dev, hver);
+        mutex_unlock(&ctl_mutex);
+
+        return ret;
+}
+
 static int rbd_init_disk(struct rbd_device *rbd_dev)
 {
         struct gendisk *disk;
@@ -1762,7 +1789,7 @@ static int rbd_init_disk(struct rbd_device *rbd_dev)
                 goto out;
 
         snprintf(disk->disk_name, sizeof(disk->disk_name), RBD_DRV_NAME "%d",
-                 rbd_dev->id);
+                 rbd_dev->dev_id);
         disk->major = rbd_dev->major;
         disk->first_minor = 0;
         disk->fops = &rbd_bd_ops;
@@ -1819,8 +1846,13 @@ static ssize_t rbd_size_show(struct device *dev,
                              struct device_attribute *attr, char *buf)
 {
         struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);
+        sector_t size;
+
+        down_read(&rbd_dev->header_rwsem);
+        size = get_capacity(rbd_dev->disk);
+        up_read(&rbd_dev->header_rwsem);
 
-        return sprintf(buf, "%llu\n", (unsigned long long)rbd_dev->header.image_size);
+        return sprintf(buf, "%llu\n", (unsigned long long) size * SECTOR_SIZE);
 }
 
 static ssize_t rbd_major_show(struct device *dev,
@@ -1848,12 +1880,20 @@ static ssize_t rbd_pool_show(struct device *dev,
         return sprintf(buf, "%s\n", rbd_dev->pool_name);
 }
 
+static ssize_t rbd_pool_id_show(struct device *dev,
+                             struct device_attribute *attr, char *buf)
+{
+        struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);
+
+        return sprintf(buf, "%d\n", rbd_dev->pool_id);
+}
+
 static ssize_t rbd_name_show(struct device *dev,
                              struct device_attribute *attr, char *buf)
 {
         struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);
 
-        return sprintf(buf, "%s\n", rbd_dev->obj);
+        return sprintf(buf, "%s\n", rbd_dev->image_name);
 }
 
 static ssize_t rbd_snap_show(struct device *dev,
@@ -1871,23 +1911,18 @@ static ssize_t rbd_image_refresh(struct device *dev,
                                  size_t size)
 {
         struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);
-        int rc;
-        int ret = size;
-
-        mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
+        int ret;
 
-        rc = __rbd_refresh_header(rbd_dev);
-        if (rc < 0)
-                ret = rc;
+        ret = rbd_refresh_header(rbd_dev, NULL);
 
-        mutex_unlock(&ctl_mutex);
-        return ret;
+        return ret < 0 ? ret : size;
 }
 
 static DEVICE_ATTR(size, S_IRUGO, rbd_size_show, NULL);
 static DEVICE_ATTR(major, S_IRUGO, rbd_major_show, NULL);
 static DEVICE_ATTR(client_id, S_IRUGO, rbd_client_id_show, NULL);
 static DEVICE_ATTR(pool, S_IRUGO, rbd_pool_show, NULL);
+static DEVICE_ATTR(pool_id, S_IRUGO, rbd_pool_id_show, NULL);
 static DEVICE_ATTR(name, S_IRUGO, rbd_name_show, NULL);
 static DEVICE_ATTR(refresh, S_IWUSR, NULL, rbd_image_refresh);
 static DEVICE_ATTR(current_snap, S_IRUGO, rbd_snap_show, NULL);
@@ -1898,6 +1933,7 @@ static struct attribute *rbd_attrs[] = {
         &dev_attr_major.attr,
         &dev_attr_client_id.attr,
         &dev_attr_pool.attr,
+        &dev_attr_pool_id.attr,
         &dev_attr_name.attr,
         &dev_attr_current_snap.attr,
         &dev_attr_refresh.attr,
@@ -1977,15 +2013,13 @@ static struct device_type rbd_snap_device_type = {
         .release        = rbd_snap_dev_release,
 };
 
-static void __rbd_remove_snap_dev(struct rbd_device *rbd_dev,
-                                  struct rbd_snap *snap)
+static void __rbd_remove_snap_dev(struct rbd_snap *snap)
 {
         list_del(&snap->node);
         device_unregister(&snap->dev);
 }
 
-static int rbd_register_snap_dev(struct rbd_device *rbd_dev,
-                                  struct rbd_snap *snap,
+static int rbd_register_snap_dev(struct rbd_snap *snap,
                                   struct device *parent)
 {
         struct device *dev = &snap->dev;
@@ -2000,29 +2034,36 @@ static int rbd_register_snap_dev(struct rbd_device *rbd_dev,
         return ret;
 }
 
-static int __rbd_add_snap_dev(struct rbd_device *rbd_dev,
-                              int i, const char *name,
-                              struct rbd_snap **snapp)
+static struct rbd_snap *__rbd_add_snap_dev(struct rbd_device *rbd_dev,
+                                              int i, const char *name)
 {
+        struct rbd_snap *snap;
         int ret;
-        struct rbd_snap *snap = kzalloc(sizeof(*snap), GFP_KERNEL);
+
+        snap = kzalloc(sizeof (*snap), GFP_KERNEL);
         if (!snap)
-                return -ENOMEM;
+                return ERR_PTR(-ENOMEM);
+
+        ret = -ENOMEM;
         snap->name = kstrdup(name, GFP_KERNEL);
+        if (!snap->name)
+                goto err;
+
         snap->size = rbd_dev->header.snap_sizes[i];
         snap->id = rbd_dev->header.snapc->snaps[i];
         if (device_is_registered(&rbd_dev->dev)) {
-                ret = rbd_register_snap_dev(rbd_dev, snap,
-                                             &rbd_dev->dev);
+                ret = rbd_register_snap_dev(snap, &rbd_dev->dev);
                 if (ret < 0)
                         goto err;
         }
-        *snapp = snap;
-        return 0;
+
+        return snap;
+
 err:
         kfree(snap->name);
         kfree(snap);
-        return ret;
+
+        return ERR_PTR(ret);
 }
 
 /*
@@ -2055,7 +2096,6 @@ static int __rbd_init_snaps_header(struct rbd_device *rbd_dev)
         const char *name, *first_name;
         int i = rbd_dev->header.total_snaps;
         struct rbd_snap *snap, *old_snap = NULL;
-        int ret;
         struct list_head *p, *n;
 
         first_name = rbd_dev->header.snap_names;
@@ -2070,8 +2110,15 @@ static int __rbd_init_snaps_header(struct rbd_device *rbd_dev)
                         cur_id = rbd_dev->header.snapc->snaps[i - 1];
 
                 if (!i || old_snap->id < cur_id) {
-                        /* old_snap->id was skipped, thus was removed */
-                        __rbd_remove_snap_dev(rbd_dev, old_snap);
+                        /*
+                         * old_snap->id was skipped, thus was
+                         * removed.  If this rbd_dev is mapped to
+                         * the removed snapshot, record that it no
+                         * longer exists, to prevent further I/O.
+                         */
+                        if (rbd_dev->snap_id == old_snap->id)
+                                rbd_dev->snap_exists = false;
+                        __rbd_remove_snap_dev(old_snap);
                         continue;
                 }
                 if (old_snap->id == cur_id) {
@@ -2091,9 +2138,9 @@ static int __rbd_init_snaps_header(struct rbd_device *rbd_dev)
                         if (cur_id >= old_snap->id)
                                 break;
                         /* a new snapshot */
-                        ret = __rbd_add_snap_dev(rbd_dev, i - 1, name, &snap);
-                        if (ret < 0)
-                                return ret;
+                        snap = __rbd_add_snap_dev(rbd_dev, i - 1, name);
+                        if (IS_ERR(snap))
+                                return PTR_ERR(snap);
 
                         /* note that we add it backward so using n and not p */
                         list_add(&snap->node, n);
@@ -2107,9 +2154,9 @@ static int __rbd_init_snaps_header(struct rbd_device *rbd_dev)
                         WARN_ON(1);
                         return -EINVAL;
                 }
-                ret = __rbd_add_snap_dev(rbd_dev, i - 1, name, &snap);
-                if (ret < 0)
-                        return ret;
+                snap = __rbd_add_snap_dev(rbd_dev, i - 1, name);
+                if (IS_ERR(snap))
+                        return PTR_ERR(snap);
                 list_add(&snap->node, &rbd_dev->snaps);
         }
 
@@ -2129,14 +2176,13 @@ static int rbd_bus_add_dev(struct rbd_device *rbd_dev)
         dev->type = &rbd_device_type;
         dev->parent = &rbd_root_dev;
         dev->release = rbd_dev_release;
-        dev_set_name(dev, "%d", rbd_dev->id);
+        dev_set_name(dev, "%d", rbd_dev->dev_id);
         ret = device_register(dev);
         if (ret < 0)
                 goto out;
 
         list_for_each_entry(snap, &rbd_dev->snaps, node) {
-                ret = rbd_register_snap_dev(rbd_dev, snap,
-                                             &rbd_dev->dev);
+                ret = rbd_register_snap_dev(snap, &rbd_dev->dev);
                 if (ret < 0)
                         break;
         }
@@ -2155,12 +2201,9 @@ static int rbd_init_watch_dev(struct rbd_device *rbd_dev)
         int ret, rc;
 
         do {
-                ret = rbd_req_sync_watch(rbd_dev, rbd_dev->obj_md_name,
-                                         rbd_dev->header.obj_version);
+                ret = rbd_req_sync_watch(rbd_dev);
                 if (ret == -ERANGE) {
-                        mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
-                        rc = __rbd_refresh_header(rbd_dev);
-                        mutex_unlock(&ctl_mutex);
+                        rc = rbd_refresh_header(rbd_dev, NULL);
                         if (rc < 0)
                                 return rc;
                 }
@@ -2177,7 +2220,7 @@ static atomic64_t rbd_id_max = ATOMIC64_INIT(0);
  */
 static void rbd_id_get(struct rbd_device *rbd_dev)
 {
-        rbd_dev->id = atomic64_inc_return(&rbd_id_max);
+        rbd_dev->dev_id = atomic64_inc_return(&rbd_id_max);
 
         spin_lock(&rbd_dev_list_lock);
         list_add_tail(&rbd_dev->node, &rbd_dev_list);
@@ -2191,7 +2234,7 @@ static void rbd_id_get(struct rbd_device *rbd_dev)
 static void rbd_id_put(struct rbd_device *rbd_dev)
 {
         struct list_head *tmp;
-        int rbd_id = rbd_dev->id;
+        int rbd_id = rbd_dev->dev_id;
         int max_id;
 
         BUG_ON(rbd_id < 1);
@@ -2282,19 +2325,58 @@ static inline size_t copy_token(const char **buf,
 }
 
 /*
- * This fills in the pool_name, obj, obj_len, snap_name, obj_len,
+ * Finds the next token in *buf, dynamically allocates a buffer big
+ * enough to hold a copy of it, and copies the token into the new
+ * buffer.  The copy is guaranteed to be terminated with '\0'.  Note
+ * that a duplicate buffer is created even for a zero-length token.
+ *
+ * Returns a pointer to the newly-allocated duplicate, or a null
+ * pointer if memory for the duplicate was not available.  If
+ * the lenp argument is a non-null pointer, the length of the token
+ * (not including the '\0') is returned in *lenp.
+ *
+ * If successful, the *buf pointer will be updated to point beyond
+ * the end of the found token.
+ *
+ * Note: uses GFP_KERNEL for allocation.
+ */
+static inline char *dup_token(const char **buf, size_t *lenp)
+{
+        char *dup;
+        size_t len;
+
+        len = next_token(buf);
+        dup = kmalloc(len + 1, GFP_KERNEL);
+        if (!dup)
+                return NULL;
+
+        memcpy(dup, *buf, len);
+        *(dup + len) = '\0';
+        *buf += len;
+
+        if (lenp)
+                *lenp = len;
+
+        return dup;
+}
+
+/*
+ * This fills in the pool_name, image_name, image_name_len, snap_name,
  * rbd_dev, rbd_md_name, and name fields of the given rbd_dev, based
  * on the list of monitor addresses and other options provided via
  * /sys/bus/rbd/add.
+ *
+ * Note: rbd_dev is assumed to have been initially zero-filled.
  */
 static int rbd_add_parse_args(struct rbd_device *rbd_dev,
                               const char *buf,
                               const char **mon_addrs,
                               size_t *mon_addrs_size,
                               char *options,
-                              size_t options_size)
+                             size_t options_size)
 {
-        size_t  len;
+        size_t len;
+        int ret;
 
         /* The first four tokens are required */
 
@@ -2310,56 +2392,74 @@ static int rbd_add_parse_args(struct rbd_device *rbd_dev,
         if (!len || len >= options_size)
                 return -EINVAL;
 
-        len = copy_token(&buf, rbd_dev->pool_name, sizeof (rbd_dev->pool_name));
-        if (!len || len >= sizeof (rbd_dev->pool_name))
-                return -EINVAL;
-
-        len = copy_token(&buf, rbd_dev->obj, sizeof (rbd_dev->obj));
-        if (!len || len >= sizeof (rbd_dev->obj))
-                return -EINVAL;
+        ret = -ENOMEM;
+        rbd_dev->pool_name = dup_token(&buf, NULL);
+        if (!rbd_dev->pool_name)
+                goto out_err;
 
-        /* We have the object length in hand, save it. */
+        rbd_dev->image_name = dup_token(&buf, &rbd_dev->image_name_len);
+        if (!rbd_dev->image_name)
+                goto out_err;
 
-        rbd_dev->obj_len = len;
+        /* Create the name of the header object */
 
-        BUILD_BUG_ON(RBD_MAX_MD_NAME_LEN
-                                < RBD_MAX_OBJ_NAME_LEN + sizeof (RBD_SUFFIX));
-        sprintf(rbd_dev->obj_md_name, "%s%s", rbd_dev->obj, RBD_SUFFIX);
+        rbd_dev->header_name = kmalloc(rbd_dev->image_name_len
+                                                + sizeof (RBD_SUFFIX),
+                                        GFP_KERNEL);
+        if (!rbd_dev->header_name)
+                goto out_err;
+        sprintf(rbd_dev->header_name, "%s%s", rbd_dev->image_name, RBD_SUFFIX);
 
         /*
-         * The snapshot name is optional, but it's an error if it's
-         * too long.  If no snapshot is supplied, fill in the default.
+         * The snapshot name is optional.  If none is is supplied,
+         * we use the default value.
          */
-        len = copy_token(&buf, rbd_dev->snap_name, sizeof (rbd_dev->snap_name));
-        if (!len)
+        rbd_dev->snap_name = dup_token(&buf, &len);
+        if (!rbd_dev->snap_name)
+                goto out_err;
+        if (!len) {
+                /* Replace the empty name with the default */
+                kfree(rbd_dev->snap_name);
+                rbd_dev->snap_name
+                        = kmalloc(sizeof (RBD_SNAP_HEAD_NAME), GFP_KERNEL);
+                if (!rbd_dev->snap_name)
+                        goto out_err;
+
                 memcpy(rbd_dev->snap_name, RBD_SNAP_HEAD_NAME,
                         sizeof (RBD_SNAP_HEAD_NAME));
-        else if (len >= sizeof (rbd_dev->snap_name))
-                return -EINVAL;
+        }
 
         return 0;
+
+out_err:
+        kfree(rbd_dev->header_name);
+        kfree(rbd_dev->image_name);
+        kfree(rbd_dev->pool_name);
+        rbd_dev->pool_name = NULL;
+
+        return ret;
 }
 
 static ssize_t rbd_add(struct bus_type *bus,
                        const char *buf,
                        size_t count)
 {
-        struct rbd_device *rbd_dev;
+        char *options;
+        struct rbd_device *rbd_dev = NULL;
         const char *mon_addrs = NULL;
         size_t mon_addrs_size = 0;
-        char *options = NULL;
         struct ceph_osd_client *osdc;
         int rc = -ENOMEM;
 
         if (!try_module_get(THIS_MODULE))
                 return -ENODEV;
 
-        rbd_dev = kzalloc(sizeof(*rbd_dev), GFP_KERNEL);
-        if (!rbd_dev)
-                goto err_nomem;
         options = kmalloc(count, GFP_KERNEL);
         if (!options)
                 goto err_nomem;
+        rbd_dev = kzalloc(sizeof(*rbd_dev), GFP_KERNEL);
+        if (!rbd_dev)
+                goto err_nomem;
 
         /* static rbd_device initialization */
         spin_lock_init(&rbd_dev->lock);
@@ -2367,15 +2467,13 @@ static ssize_t rbd_add(struct bus_type *bus,
         INIT_LIST_HEAD(&rbd_dev->snaps);
         init_rwsem(&rbd_dev->header_rwsem);
 
-        init_rwsem(&rbd_dev->header_rwsem);
-
         /* generate unique id: find highest unique id, add one */
         rbd_id_get(rbd_dev);
 
         /* Fill in the device name, now that we have its id. */
         BUILD_BUG_ON(DEV_NAME_LEN
                         < sizeof (RBD_DRV_NAME) + MAX_INT_FORMAT_WIDTH);
-        sprintf(rbd_dev->name, "%s%d", RBD_DRV_NAME, rbd_dev->id);
+        sprintf(rbd_dev->name, "%s%d", RBD_DRV_NAME, rbd_dev->dev_id);
 
         /* parse add command */
         rc = rbd_add_parse_args(rbd_dev, buf, &mon_addrs, &mon_addrs_size,
@@ -2395,7 +2493,7 @@ static ssize_t rbd_add(struct bus_type *bus,
         rc = ceph_pg_poolid_by_name(osdc->osdmap, rbd_dev->pool_name);
         if (rc < 0)
                 goto err_out_client;
-        rbd_dev->poolid = rc;
+        rbd_dev->pool_id = rc;
 
         /* register our block device */
         rc = register_blkdev(0, rbd_dev->name);
@@ -2435,10 +2533,16 @@ err_out_blkdev:
 err_out_client:
         rbd_put_client(rbd_dev);
 err_put_id:
+        if (rbd_dev->pool_name) {
+                kfree(rbd_dev->snap_name);
+                kfree(rbd_dev->header_name);
+                kfree(rbd_dev->image_name);
+                kfree(rbd_dev->pool_name);
+        }
         rbd_id_put(rbd_dev);
 err_nomem:
-        kfree(options);
         kfree(rbd_dev);
+        kfree(options);
 
         dout("Error adding device %s\n", buf);
         module_put(THIS_MODULE);
@@ -2446,7 +2550,7 @@ err_nomem:
         return (ssize_t) rc;
 }
 
-static struct rbd_device *__rbd_get_dev(unsigned long id)
+static struct rbd_device *__rbd_get_dev(unsigned long dev_id)
 {
         struct list_head *tmp;
         struct rbd_device *rbd_dev;
@@ -2454,7 +2558,7 @@ static struct rbd_device *__rbd_get_dev(unsigned long id)
         spin_lock(&rbd_dev_list_lock);
         list_for_each(tmp, &rbd_dev_list) {
                 rbd_dev = list_entry(tmp, struct rbd_device, node);
-                if (rbd_dev->id == id) {
+                if (rbd_dev->dev_id == dev_id) {
                         spin_unlock(&rbd_dev_list_lock);
                         return rbd_dev;
                 }
@@ -2474,7 +2578,7 @@ static void rbd_dev_release(struct device *dev)
                                                     rbd_dev->watch_request);
         }
         if (rbd_dev->watch_event)
-                rbd_req_sync_unwatch(rbd_dev, rbd_dev->obj_md_name);
+                rbd_req_sync_unwatch(rbd_dev);
 
         rbd_put_client(rbd_dev);
 
@@ -2483,6 +2587,10 @@ static void rbd_dev_release(struct device *dev)
         unregister_blkdev(rbd_dev->major, rbd_dev->name);
 
         /* done with the id, and with the rbd_dev */
+        kfree(rbd_dev->snap_name);
+        kfree(rbd_dev->header_name);
+        kfree(rbd_dev->pool_name);
+        kfree(rbd_dev->image_name);
         rbd_id_put(rbd_dev);
         kfree(rbd_dev);
 
@@ -2544,7 +2652,7 @@ static ssize_t rbd_snap_add(struct device *dev,
         if (ret < 0)
                 goto err_unlock;
 
-        ret = __rbd_refresh_header(rbd_dev);
+        ret = __rbd_refresh_header(rbd_dev, NULL);
         if (ret < 0)
                 goto err_unlock;
 
@@ -2553,7 +2661,7 @@ static ssize_t rbd_snap_add(struct device *dev,
         mutex_unlock(&ctl_mutex);
 
         /* make a best effort, don't error if failed */
-        rbd_req_sync_notify(rbd_dev, rbd_dev->obj_md_name);
+        rbd_req_sync_notify(rbd_dev);
 
         ret = count;
         kfree(name);
diff --git a/drivers/block/rbd_types.h b/drivers/block/rbd_types.h
index 950708688f17..0924e9e41a60 100644
--- a/drivers/block/rbd_types.h
+++ b/drivers/block/rbd_types.h
@@ -31,7 +31,6 @@
 #define RBD_MIN_OBJ_ORDER       16
 #define RBD_MAX_OBJ_ORDER       30
 
-#define RBD_MAX_OBJ_NAME_LEN    96
 #define RBD_MAX_SEG_NAME_LEN    128
 
 #define RBD_COMP_NONE           0
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index e4fb3374dcd2..2c2d2e5c1597 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -888,9 +888,8 @@ static int setup_blkring(struct xenbus_device *dev,
         if (err)
                 goto fail;
 
-        err = bind_evtchn_to_irqhandler(info->evtchn,
-                                        blkif_interrupt,
-                                        IRQF_SAMPLE_RANDOM, "blkif", info);
+        err = bind_evtchn_to_irqhandler(info->evtchn, blkif_interrupt, 0,
+                                        "blkif", info);
         if (err <= 0) {
                 xenbus_dev_fatal(dev, err,
                                  "bind_evtchn_to_irqhandler failed");
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 4ec04a754733..b86eae9b77df 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -125,21 +125,26 @@
  * The current exported interfaces for gathering environmental noise
  * from the devices are:
  *
+ *      void add_device_randomness(const void *buf, unsigned int size);
  *      void add_input_randomness(unsigned int type, unsigned int code,
  *                                unsigned int value);
- *      void add_interrupt_randomness(int irq);
+ *      void add_interrupt_randomness(int irq, int irq_flags);
  *      void add_disk_randomness(struct gendisk *disk);
  *
+ * add_device_randomness() is for adding data to the random pool that
+ * is likely to differ between two devices (or possibly even per boot).
+ * This would be things like MAC addresses or serial numbers, or the
+ * read-out of the RTC. This does *not* add any actual entropy to the
+ * pool, but it initializes the pool to different values for devices
+ * that might otherwise be identical and have very little entropy
+ * available to them (particularly common in the embedded world).
+ *
  * add_input_randomness() uses the input layer interrupt timing, as well as
  * the event type information from the hardware.
  *
- * add_interrupt_randomness() uses the inter-interrupt timing as random
- * inputs to the entropy pool.  Note that not all interrupts are good
- * sources of randomness!  For example, the timer interrupts is not a
- * good choice, because the periodicity of the interrupts is too
- * regular, and hence predictable to an attacker.  Network Interface
- * Controller interrupts are a better measure, since the timing of the
- * NIC interrupts are more unpredictable.
+ * add_interrupt_randomness() uses the interrupt timing as random
+ * inputs to the entropy pool. Using the cycle counters and the irq source
+ * as inputs, it feeds the randomness roughly once a second.
  *
  * add_disk_randomness() uses what amounts to the seek time of block
  * layer request events, on a per-disk_devt basis, as input to the
@@ -248,6 +253,8 @@
 #include <linux/percpu.h>
 #include <linux/cryptohash.h>
 #include <linux/fips.h>
+#include <linux/ptrace.h>
+#include <linux/kmemcheck.h>
 
 #ifdef CONFIG_GENERIC_HARDIRQS
 # include <linux/irq.h>
@@ -256,8 +263,12 @@
 #include <asm/processor.h>
 #include <asm/uaccess.h>
 #include <asm/irq.h>
+#include <asm/irq_regs.h>
 #include <asm/io.h>
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/random.h>
+
 /*
  * Configuration information
  */
@@ -266,6 +277,8 @@
 #define SEC_XFER_SIZE 512
 #define EXTRACT_SIZE 10
 
+#define LONGS(x) (((x) + sizeof(unsigned long) - 1)/sizeof(unsigned long))
+
 /*
  * The minimum number of bits of entropy before we wake up a read on
  * /dev/random.  Should be enough to do a significant reseed.
@@ -420,8 +433,10 @@ struct entropy_store {
         /* read-write data: */
         spinlock_t lock;
         unsigned add_ptr;
+        unsigned input_rotate;
         int entropy_count;
-        int input_rotate;
+        int entropy_total;
+        unsigned int initialized:1;
         __u8 last_data[EXTRACT_SIZE];
 };
 
@@ -454,6 +469,10 @@ static struct entropy_store nonblocking_pool = {
         .pool = nonblocking_pool_data
 };
 
+static __u32 const twist_table[8] = {
+        0x00000000, 0x3b6e20c8, 0x76dc4190, 0x4db26158,
+        0xedb88320, 0xd6d6a3e8, 0x9b64c2b0, 0xa00ae278 };
+
 /*
  * This function adds bytes into the entropy "pool".  It does not
  * update the entropy estimate.  The caller should call
@@ -464,29 +483,24 @@ static struct entropy_store nonblocking_pool = {
  * it's cheap to do so and helps slightly in the expected case where
  * the entropy is concentrated in the low-order bits.
  */
-static void mix_pool_bytes_extract(struct entropy_store *r, const void *in,
-                                   int nbytes, __u8 out[64])
+static void _mix_pool_bytes(struct entropy_store *r, const void *in,
+                            int nbytes, __u8 out[64])
 {
-        static __u32 const twist_table[8] = {
-                0x00000000, 0x3b6e20c8, 0x76dc4190, 0x4db26158,
-                0xedb88320, 0xd6d6a3e8, 0x9b64c2b0, 0xa00ae278 };
         unsigned long i, j, tap1, tap2, tap3, tap4, tap5;
         int input_rotate;
         int wordmask = r->poolinfo->poolwords - 1;
         const char *bytes = in;
         __u32 w;
-        unsigned long flags;
 
-        /* Taps are constant, so we can load them without holding r->lock.  */
         tap1 = r->poolinfo->tap1;
         tap2 = r->poolinfo->tap2;
         tap3 = r->poolinfo->tap3;
         tap4 = r->poolinfo->tap4;
         tap5 = r->poolinfo->tap5;
 
-        spin_lock_irqsave(&r->lock, flags);
-        input_rotate = r->input_rotate;
-        i = r->add_ptr;
+        smp_rmb();
+        input_rotate = ACCESS_ONCE(r->input_rotate);
+        i = ACCESS_ONCE(r->add_ptr);
 
         /* mix one byte at a time to simplify size handling and churn faster */
         while (nbytes--) {
@@ -513,19 +527,61 @@ static void mix_pool_bytes_extract(struct entropy_store *r, const void *in,
                 input_rotate += i ? 7 : 14;
         }
 
-        r->input_rotate = input_rotate;
-        r->add_ptr = i;
+        ACCESS_ONCE(r->input_rotate) = input_rotate;
+        ACCESS_ONCE(r->add_ptr) = i;
+        smp_wmb();
 
         if (out)
                 for (j = 0; j < 16; j++)
                         ((__u32 *)out)[j] = r->pool[(i - j) & wordmask];
+}
+
+static void __mix_pool_bytes(struct entropy_store *r, const void *in,
+                             int nbytes, __u8 out[64])
+{
+        trace_mix_pool_bytes_nolock(r->name, nbytes, _RET_IP_);
+        _mix_pool_bytes(r, in, nbytes, out);
+}
+
+static void mix_pool_bytes(struct entropy_store *r, const void *in,
+                           int nbytes, __u8 out[64])
+{
+        unsigned long flags;
 
+        trace_mix_pool_bytes(r->name, nbytes, _RET_IP_);
+        spin_lock_irqsave(&r->lock, flags);
+        _mix_pool_bytes(r, in, nbytes, out);
         spin_unlock_irqrestore(&r->lock, flags);
 }
 
-static void mix_pool_bytes(struct entropy_store *r, const void *in, int bytes)
+struct fast_pool {
+        __u32           pool[4];
+        unsigned long   last;
+        unsigned short  count;
+        unsigned char   rotate;
+        unsigned char   last_timer_intr;
+};
+
+/*
+ * This is a fast mixing routine used by the interrupt randomness
+ * collector.  It's hardcoded for an 128 bit pool and assumes that any
+ * locks that might be needed are taken by the caller.
+ */
+static void fast_mix(struct fast_pool *f, const void *in, int nbytes)
 {
-       mix_pool_bytes_extract(r, in, bytes, NULL);
+        const char      *bytes = in;
+        __u32           w;
+        unsigned        i = f->count;
+        unsigned        input_rotate = f->rotate;
+
+        while (nbytes--) {
+                w = rol32(*bytes++, input_rotate & 31) ^ f->pool[i & 3] ^
+                        f->pool[(i + 1) & 3];
+                f->pool[i & 3] = (w >> 3) ^ twist_table[w & 7];
+                input_rotate += (i++ & 3) ? 7 : 14;
+        }
+        f->count = i;
+        f->rotate = input_rotate;
 }
 
 /*
@@ -533,30 +589,38 @@ static void mix_pool_bytes(struct entropy_store *r, const void *in, int bytes)
  */
 static void credit_entropy_bits(struct entropy_store *r, int nbits)
 {
-        unsigned long flags;
-        int entropy_count;
+        int entropy_count, orig;
 
         if (!nbits)
                 return;
 
-        spin_lock_irqsave(&r->lock, flags);
-
         DEBUG_ENT("added %d entropy credits to %s\n", nbits, r->name);
-        entropy_count = r->entropy_count;
+retry:
+        entropy_count = orig = ACCESS_ONCE(r->entropy_count);
         entropy_count += nbits;
+
         if (entropy_count < 0) {
                 DEBUG_ENT("negative entropy/overflow\n");
                 entropy_count = 0;
         } else if (entropy_count > r->poolinfo->POOLBITS)
                 entropy_count = r->poolinfo->POOLBITS;
-        r->entropy_count = entropy_count;
+        if (cmpxchg(&r->entropy_count, orig, entropy_count) != orig)
+                goto retry;
+
+        if (!r->initialized && nbits > 0) {
+                r->entropy_total += nbits;
+                if (r->entropy_total > 128)
+                        r->initialized = 1;
+        }
+
+        trace_credit_entropy_bits(r->name, nbits, entropy_count,
+                                  r->entropy_total, _RET_IP_);
 
         /* should we wake readers? */
         if (r == &input_pool && entropy_count >= random_read_wakeup_thresh) {
                 wake_up_interruptible(&random_read_wait);
                 kill_fasync(&fasync, SIGIO, POLL_IN);
         }
-        spin_unlock_irqrestore(&r->lock, flags);
 }
 
 /*********************************************************************
@@ -572,42 +636,24 @@ struct timer_rand_state {
         unsigned dont_count_entropy:1;
 };
 
-#ifndef CONFIG_GENERIC_HARDIRQS
-
-static struct timer_rand_state *irq_timer_state[NR_IRQS];
-
-static struct timer_rand_state *get_timer_rand_state(unsigned int irq)
-{
-        return irq_timer_state[irq];
-}
-
-static void set_timer_rand_state(unsigned int irq,
-                                 struct timer_rand_state *state)
-{
-        irq_timer_state[irq] = state;
-}
-
-#else
-
-static struct timer_rand_state *get_timer_rand_state(unsigned int irq)
-{
-        struct irq_desc *desc;
-
-        desc = irq_to_desc(irq);
-
-        return desc->timer_rand_state;
-}
-
-static void set_timer_rand_state(unsigned int irq,
-                                 struct timer_rand_state *state)
+/*
+ * Add device- or boot-specific data to the input and nonblocking
+ * pools to help initialize them to unique values.
+ *
+ * None of this adds any entropy, it is meant to avoid the
+ * problem of the nonblocking pool having similar initial state
+ * across largely identical devices.
+ */
+void add_device_randomness(const void *buf, unsigned int size)
 {
-        struct irq_desc *desc;
+        unsigned long time = get_cycles() ^ jiffies;
 
-        desc = irq_to_desc(irq);
-
-        desc->timer_rand_state = state;
+        mix_pool_bytes(&input_pool, buf, size, NULL);
+        mix_pool_bytes(&input_pool, &time, sizeof(time), NULL);
+        mix_pool_bytes(&nonblocking_pool, buf, size, NULL);
+        mix_pool_bytes(&nonblocking_pool, &time, sizeof(time), NULL);
 }
-#endif
+EXPORT_SYMBOL(add_device_randomness);
 
 static struct timer_rand_state input_timer_state;
 
@@ -637,13 +683,9 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
                 goto out;
 
         sample.jiffies = jiffies;
-
-        /* Use arch random value, fall back to cycles */
-        if (!arch_get_random_int(&sample.cycles))
-                sample.cycles = get_cycles();
-
+        sample.cycles = get_cycles();
         sample.num = num;
-        mix_pool_bytes(&input_pool, &sample, sizeof(sample));
+        mix_pool_bytes(&input_pool, &sample, sizeof(sample), NULL);
 
         /*
          * Calculate number of bits of randomness we probably added.
@@ -700,17 +742,48 @@ void add_input_randomness(unsigned int type, unsigned int code,
 }
 EXPORT_SYMBOL_GPL(add_input_randomness);
 
-void add_interrupt_randomness(int irq)
+static DEFINE_PER_CPU(struct fast_pool, irq_randomness);
+
+void add_interrupt_randomness(int irq, int irq_flags)
 {
-        struct timer_rand_state *state;
+        struct entropy_store    *r;
+        struct fast_pool        *fast_pool = &__get_cpu_var(irq_randomness);
+        struct pt_regs          *regs = get_irq_regs();
+        unsigned long           now = jiffies;
+        __u32                   input[4], cycles = get_cycles();
+
+        input[0] = cycles ^ jiffies;
+        input[1] = irq;
+        if (regs) {
+                __u64 ip = instruction_pointer(regs);
+                input[2] = ip;
+                input[3] = ip >> 32;
+        }
 
-        state = get_timer_rand_state(irq);
+        fast_mix(fast_pool, input, sizeof(input));
 
-        if (state == NULL)
+        if ((fast_pool->count & 1023) &&
+            !time_after(now, fast_pool->last + HZ))
                 return;
 
-        DEBUG_ENT("irq event %d\n", irq);
-        add_timer_randomness(state, 0x100 + irq);
+        fast_pool->last = now;
+
+        r = nonblocking_pool.initialized ? &input_pool : &nonblocking_pool;
+        __mix_pool_bytes(r, &fast_pool->pool, sizeof(fast_pool->pool), NULL);
+        /*
+         * If we don't have a valid cycle counter, and we see
+         * back-to-back timer interrupts, then skip giving credit for
+         * any entropy.
+         */
+        if (cycles == 0) {
+                if (irq_flags & __IRQF_TIMER) {
+                        if (fast_pool->last_timer_intr)
+                                return;
+                        fast_pool->last_timer_intr = 1;
+                } else
+                        fast_pool->last_timer_intr = 0;
+        }
+        credit_entropy_bits(r, 1);
 }
 
 #ifdef CONFIG_BLOCK
@@ -742,7 +815,7 @@ static ssize_t extract_entropy(struct entropy_store *r, void *buf,
  */
 static void xfer_secondary_pool(struct entropy_store *r, size_t nbytes)
 {
-        __u32 tmp[OUTPUT_POOL_WORDS];
+        __u32   tmp[OUTPUT_POOL_WORDS];
 
         if (r->pull && r->entropy_count < nbytes * 8 &&
             r->entropy_count < r->poolinfo->POOLBITS) {
@@ -761,7 +834,7 @@ static void xfer_secondary_pool(struct entropy_store *r, size_t nbytes)
 
                 bytes = extract_entropy(r->pull, tmp, bytes,
                                         random_read_wakeup_thresh / 8, rsvd);
-                mix_pool_bytes(r, tmp, bytes);
+                mix_pool_bytes(r, tmp, bytes, NULL);
                 credit_entropy_bits(r, bytes*8);
         }
 }
@@ -820,13 +893,19 @@ static size_t account(struct entropy_store *r, size_t nbytes, int min,
 static void extract_buf(struct entropy_store *r, __u8 *out)
 {
         int i;
-        __u32 hash[5], workspace[SHA_WORKSPACE_WORDS];
+        union {
+                __u32 w[5];
+                unsigned long l[LONGS(EXTRACT_SIZE)];
+        } hash;
+        __u32 workspace[SHA_WORKSPACE_WORDS];
         __u8 extract[64];
+        unsigned long flags;
 
         /* Generate a hash across the pool, 16 words (512 bits) at a time */
-        sha_init(hash);
+        sha_init(hash.w);
+        spin_lock_irqsave(&r->lock, flags);
         for (i = 0; i < r->poolinfo->poolwords; i += 16)
-                sha_transform(hash, (__u8 *)(r->pool + i), workspace);
+                sha_transform(hash.w, (__u8 *)(r->pool + i), workspace);
 
         /*
          * We mix the hash back into the pool to prevent backtracking
@@ -837,13 +916,14 @@ static void extract_buf(struct entropy_store *r, __u8 *out)
          * brute-forcing the feedback as hard as brute-forcing the
          * hash.
          */
-        mix_pool_bytes_extract(r, hash, sizeof(hash), extract);
+        __mix_pool_bytes(r, hash.w, sizeof(hash.w), extract);
+        spin_unlock_irqrestore(&r->lock, flags);
 
         /*
          * To avoid duplicates, we atomically extract a portion of the
          * pool while mixing, and hash one final time.
          */
-        sha_transform(hash, extract, workspace);
+        sha_transform(hash.w, extract, workspace);
         memset(extract, 0, sizeof(extract));
         memset(workspace, 0, sizeof(workspace));
 
@@ -852,20 +932,32 @@ static void extract_buf(struct entropy_store *r, __u8 *out)
          * pattern, we fold it in half. Thus, we always feed back
          * twice as much data as we output.
          */
-        hash[0] ^= hash[3];
-        hash[1] ^= hash[4];
-        hash[2] ^= rol32(hash[2], 16);
-        memcpy(out, hash, EXTRACT_SIZE);
-        memset(hash, 0, sizeof(hash));
+        hash.w[0] ^= hash.w[3];
+        hash.w[1] ^= hash.w[4];
+        hash.w[2] ^= rol32(hash.w[2], 16);
+
+        /*
+         * If we have a architectural hardware random number
+         * generator, mix that in, too.
+         */
+        for (i = 0; i < LONGS(EXTRACT_SIZE); i++) {
+                unsigned long v;
+                if (!arch_get_random_long(&v))
+                        break;
+                hash.l[i] ^= v;
+        }
+
+        memcpy(out, &hash, EXTRACT_SIZE);
+        memset(&hash, 0, sizeof(hash));
 }
 
 static ssize_t extract_entropy(struct entropy_store *r, void *buf,
-                               size_t nbytes, int min, int reserved)
+                                 size_t nbytes, int min, int reserved)
 {
         ssize_t ret = 0, i;
         __u8 tmp[EXTRACT_SIZE];
-        unsigned long flags;
 
+        trace_extract_entropy(r->name, nbytes, r->entropy_count, _RET_IP_);
         xfer_secondary_pool(r, nbytes);
         nbytes = account(r, nbytes, min, reserved);
 
@@ -873,6 +965,8 @@ static ssize_t extract_entropy(struct entropy_store *r, void *buf,
                 extract_buf(r, tmp);
 
                 if (fips_enabled) {
+                        unsigned long flags;
+
                         spin_lock_irqsave(&r->lock, flags);
                         if (!memcmp(tmp, r->last_data, EXTRACT_SIZE))
                                 panic("Hardware RNG duplicated output!\n");
@@ -898,6 +992,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
         ssize_t ret = 0, i;
         __u8 tmp[EXTRACT_SIZE];
 
+        trace_extract_entropy_user(r->name, nbytes, r->entropy_count, _RET_IP_);
         xfer_secondary_pool(r, nbytes);
         nbytes = account(r, nbytes, 0, 0);
 
@@ -931,17 +1026,35 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
 
 /*
  * This function is the exported kernel interface.  It returns some
- * number of good random numbers, suitable for seeding TCP sequence
- * numbers, etc.
+ * number of good random numbers, suitable for key generation, seeding
+ * TCP sequence numbers, etc.  It does not use the hw random number
+ * generator, if available; use get_random_bytes_arch() for that.
  */
 void get_random_bytes(void *buf, int nbytes)
 {
+        extract_entropy(&nonblocking_pool, buf, nbytes, 0, 0);
+}
+EXPORT_SYMBOL(get_random_bytes);
+
+/*
+ * This function will use the architecture-specific hardware random
+ * number generator if it is available.  The arch-specific hw RNG will
+ * almost certainly be faster than what we can do in software, but it
+ * is impossible to verify that it is implemented securely (as
+ * opposed, to, say, the AES encryption of a sequence number using a
+ * key known by the NSA).  So it's useful if we need the speed, but
+ * only if we're willing to trust the hardware manufacturer not to
+ * have put in a back door.
+ */
+void get_random_bytes_arch(void *buf, int nbytes)
+{
         char *p = buf;
 
+        trace_get_random_bytes(nbytes, _RET_IP_);
         while (nbytes) {
                 unsigned long v;
                 int chunk = min(nbytes, (int)sizeof(unsigned long));
-                
+
                 if (!arch_get_random_long(&v))
                         break;
                 
@@ -950,9 +1063,11 @@ void get_random_bytes(void *buf, int nbytes)
                 nbytes -= chunk;
         }
 
-        extract_entropy(&nonblocking_pool, p, nbytes, 0, 0);
+        if (nbytes)
+                extract_entropy(&nonblocking_pool, p, nbytes, 0, 0);
 }
-EXPORT_SYMBOL(get_random_bytes);
+EXPORT_SYMBOL(get_random_bytes_arch);
+
 
 /*
  * init_std_data - initialize pool with system data
@@ -966,23 +1081,30 @@ EXPORT_SYMBOL(get_random_bytes);
 static void init_std_data(struct entropy_store *r)
 {
         int i;
-        ktime_t now;
-        unsigned long flags;
+        ktime_t now = ktime_get_real();
+        unsigned long rv;
 
-        spin_lock_irqsave(&r->lock, flags);
         r->entropy_count = 0;
-        spin_unlock_irqrestore(&r->lock, flags);
-
-        now = ktime_get_real();
-        mix_pool_bytes(r, &now, sizeof(now));
-        for (i = r->poolinfo->POOLBYTES; i > 0; i -= sizeof flags) {
-                if (!arch_get_random_long(&flags))
+        r->entropy_total = 0;
+        mix_pool_bytes(r, &now, sizeof(now), NULL);
+        for (i = r->poolinfo->POOLBYTES; i > 0; i -= sizeof(rv)) {
+                if (!arch_get_random_long(&rv))
                         break;
-                mix_pool_bytes(r, &flags, sizeof(flags));
+                mix_pool_bytes(r, &rv, sizeof(rv), NULL);
         }
-        mix_pool_bytes(r, utsname(), sizeof(*(utsname())));
+        mix_pool_bytes(r, utsname(), sizeof(*(utsname())), NULL);
 }
 
+/*
+ * Note that setup_arch() may call add_device_randomness()
+ * long before we get here. This allows seeding of the pools
+ * with some platform dependent data very early in the boot
+ * process. But it limits our options here. We must use
+ * statically allocated structures that already have all
+ * initializations complete at compile time. We should also
+ * take care not to overwrite the precious per platform data
+ * we were given.
+ */
 static int rand_initialize(void)
 {
         init_std_data(&input_pool);
@@ -992,24 +1114,6 @@ static int rand_initialize(void)
 }
 module_init(rand_initialize);
 
-void rand_initialize_irq(int irq)
-{
-        struct timer_rand_state *state;
-
-        state = get_timer_rand_state(irq);
-
-        if (state)
-                return;
-
-        /*
-         * If kzalloc returns null, we just won't use that entropy
-         * source.
-         */
-        state = kzalloc(sizeof(struct timer_rand_state), GFP_KERNEL);
-        if (state)
-                set_timer_rand_state(irq, state);
-}
-
 #ifdef CONFIG_BLOCK
 void rand_initialize_disk(struct gendisk *disk)
 {
@@ -1117,7 +1221,7 @@ write_pool(struct entropy_store *r, const char __user *buffer, size_t count)
                 count -= bytes;
                 p += bytes;
 
-                mix_pool_bytes(r, buf, bytes);
+                mix_pool_bytes(r, buf, bytes, NULL);
                 cond_resched();
         }
 
@@ -1279,6 +1383,7 @@ static int proc_do_uuid(ctl_table *table, int write,
 }
 
 static int sysctl_poolsize = INPUT_POOL_WORDS * 32;
+extern ctl_table random_table[];
 ctl_table random_table[] = {
         {
                 .procname       = "poolsize",
@@ -1344,7 +1449,7 @@ late_initcall(random_int_secret_init);
  * value is not cryptographically secure but for several uses the cost of
  * depleting entropy is too high
  */
-DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash);
+static DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash);
 unsigned int get_random_int(void)
 {
         __u32 *hash;
diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c
index 67b97c5fd859..a8bd0310f8fe 100644
--- a/drivers/crypto/n2_core.c
+++ b/drivers/crypto/n2_core.c
@@ -1610,8 +1610,7 @@ static int spu_map_ino(struct platform_device *dev, struct spu_mdesc_info *ip,
 
         sprintf(p->irq_name, "%s-%d", irq_name, index);
 
-        return request_irq(p->irq, handler, IRQF_SAMPLE_RANDOM,
-                           p->irq_name, p);
+        return request_irq(p->irq, handler, 0, p->irq_name, p);
 }
 
 static struct kmem_cache *queue_cache[2];
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 153980be4ee6..b298158cb922 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -6,6 +6,7 @@
 #include <linux/dmi.h>
 #include <linux/efi.h>
 #include <linux/bootmem.h>
+#include <linux/random.h>
 #include <asm/dmi.h>
 
 /*
@@ -111,6 +112,8 @@ static int __init dmi_walk_early(void (*decode)(const struct dmi_header *,
 
         dmi_table(buf, dmi_len, dmi_num, decode, NULL);
 
+        add_device_randomness(buf, dmi_len);
+
         dmi_iounmap(buf, dmi_len);
         return 0;
 }
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 500844f04f93..60ea284407ce 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1928,6 +1928,7 @@ static const struct hid_device_id hid_ignore_list[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_GRETAGMACBETH, USB_DEVICE_ID_GRETAGMACBETH_HUEY) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_RADIOSHARK) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_90) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_100) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_101) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 41c34f21bd00..1dcb76ff51e3 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -333,6 +333,7 @@
 #define USB_VENDOR_ID_GRIFFIN           0x077d
 #define USB_DEVICE_ID_POWERMATE         0x0410
 #define USB_DEVICE_ID_SOUNDKNOB         0x04AA
+#define USB_DEVICE_ID_RADIOSHARK        0x627a
 
 #define USB_VENDOR_ID_GTCO              0x078c
 #define USB_DEVICE_ID_GTCO_90           0x0090
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index a220e5746d67..4748086eaaf2 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -545,8 +545,7 @@ static int vmbus_bus_init(int irq)
         if (ret)
                 goto err_cleanup;
 
-        ret = request_irq(irq, vmbus_isr, IRQF_SAMPLE_RANDOM,
-                        driver_name, hv_acpi_dev);
+        ret = request_irq(irq, vmbus_isr, 0, driver_name, hv_acpi_dev);
 
         if (ret != 0) {
                 pr_err("Unable to request IRQ %d\n",
diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c
index 07b7447ecbc9..3d71395ae1f7 100644
--- a/drivers/i2c/busses/i2c-pmcmsp.c
+++ b/drivers/i2c/busses/i2c-pmcmsp.c
@@ -306,8 +306,7 @@ static int __devinit pmcmsptwi_probe(struct platform_device *pldev)
         pmcmsptwi_data.irq = platform_get_irq(pldev, 0);
         if (pmcmsptwi_data.irq) {
                 rc = request_irq(pmcmsptwi_data.irq, &pmcmsptwi_interrupt,
-                        IRQF_SHARED | IRQF_SAMPLE_RANDOM,
-                        pldev->name, &pmcmsptwi_data);
+                                 IRQF_SHARED, pldev->name, &pmcmsptwi_data);
                 if (rc == 0) {
                         /*
                          * Enable 'DONE' interrupt only.
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 5a335b5447c6..7172559ce0c1 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -3064,10 +3064,7 @@ static int cma_join_ib_multicast(struct rdma_id_private *id_priv,
                                                 id_priv->id.port_num, &rec,
                                                 comp_mask, GFP_KERNEL,
                                                 cma_ib_mc_handler, mc);
-        if (IS_ERR(mc->multicast.ib))
-                return PTR_ERR(mc->multicast.ib);
-
-        return 0;
+        return PTR_RET(mc->multicast.ib);
 }
 
 static void iboe_mcast_work_handler(struct work_struct *work)
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index 893cb879462c..6bf850422895 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -1002,23 +1002,18 @@ static ssize_t ucma_set_option(struct ucma_file *file, const char __user *inbuf,
         if (IS_ERR(ctx))
                 return PTR_ERR(ctx);
 
-        optval = kmalloc(cmd.optlen, GFP_KERNEL);
-        if (!optval) {
-                ret = -ENOMEM;
-                goto out1;
-        }
-
-        if (copy_from_user(optval, (void __user *) (unsigned long) cmd.optval,
-                           cmd.optlen)) {
-                ret = -EFAULT;
-                goto out2;
+        optval = memdup_user((void __user *) (unsigned long) cmd.optval,
+                             cmd.optlen);
+        if (IS_ERR(optval)) {
+                ret = PTR_ERR(optval);
+                goto out;
         }
 
         ret = ucma_set_option_level(ctx, cmd.level, cmd.optname, optval,
                                     cmd.optlen);
-out2:
         kfree(optval);
-out1:
+
+out:
         ucma_put_ctx(ctx);
         return ret;
 }
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index b2f9784beb4a..cb5b7f7d4d38 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -893,7 +893,9 @@ static int ocrdma_check_qp_params(struct ib_pd *ibpd, struct ocrdma_dev *dev,
         /* verify consumer QPs are not trying to use GSI QP's CQ */
         if ((attrs->qp_type != IB_QPT_GSI) && (dev->gsi_qp_created)) {
                 if ((dev->gsi_sqcq == get_ocrdma_cq(attrs->send_cq)) ||
-                    (dev->gsi_sqcq == get_ocrdma_cq(attrs->send_cq))) {
+                    (dev->gsi_sqcq == get_ocrdma_cq(attrs->recv_cq)) ||
+                    (dev->gsi_rqcq == get_ocrdma_cq(attrs->send_cq)) ||
+                    (dev->gsi_rqcq == get_ocrdma_cq(attrs->recv_cq))) {
                         ocrdma_err("%s(%d) Consumer QP cannot use GSI CQs.\n",
                                    __func__, dev->id);
                         return -EINVAL;
diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
index 6e19ec844d99..7b1b86690024 100644
--- a/drivers/infiniband/hw/qib/qib.h
+++ b/drivers/infiniband/hw/qib/qib.h
@@ -656,6 +656,11 @@ struct qib_pportdata {
         /* 16 congestion entries with each entry corresponding to a SL */
         struct ib_cc_congestion_entry_shadow *congestion_entries;
 
+        /* Maximum number of congestion control entries that the agent expects
+         * the manager to send.
+         */
+        u16 cc_supported_table_entries;
+
         /* Total number of congestion control table entries */
         u16 total_cct_entry;
 
@@ -667,11 +672,6 @@ struct qib_pportdata {
 
         /* CA's max number of 64 entry units in the congestion control table */
         u8 cc_max_table_entries;
-
-        /* Maximum number of congestion control entries that the agent expects
-         * the manager to send.
-         */
-        u8 cc_supported_table_entries;
 };
 
 /* Observers. Not to be taken lightly, possibly not to ship. */
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index 86df632ea612..ca43901ed861 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -92,6 +92,8 @@ enum {
         IPOIB_STOP_REAPER         = 7,
         IPOIB_FLAG_ADMIN_CM       = 9,
         IPOIB_FLAG_UMCAST         = 10,
+        IPOIB_STOP_NEIGH_GC       = 11,
+        IPOIB_NEIGH_TBL_FLUSH     = 12,
 
         IPOIB_MAX_BACKOFF_SECONDS = 16,
 
@@ -260,6 +262,20 @@ struct ipoib_ethtool_st {
         u16     max_coalesced_frames;
 };
 
+struct ipoib_neigh_hash {
+        struct ipoib_neigh __rcu      **buckets;
+        struct rcu_head                 rcu;
+        u32                             mask;
+        u32                             size;
+};
+
+struct ipoib_neigh_table {
+        struct ipoib_neigh_hash __rcu  *htbl;
+        rwlock_t                        rwlock;
+        atomic_t                        entries;
+        struct completion               flushed;
+};
+
 /*
  * Device private locking: network stack tx_lock protects members used
  * in TX fast path, lock protects everything else.  lock nests inside
@@ -279,6 +295,8 @@ struct ipoib_dev_priv {
         struct rb_root  path_tree;
         struct list_head path_list;
 
+        struct ipoib_neigh_table ntbl;
+
         struct ipoib_mcast *broadcast;
         struct list_head multicast_list;
         struct rb_root multicast_tree;
@@ -291,7 +309,7 @@ struct ipoib_dev_priv {
         struct work_struct flush_heavy;
         struct work_struct restart_task;
         struct delayed_work ah_reap_task;
-
+        struct delayed_work neigh_reap_task;
         struct ib_device *ca;
         u8                port;
         u16               pkey;
@@ -377,13 +395,16 @@ struct ipoib_neigh {
 #ifdef CONFIG_INFINIBAND_IPOIB_CM
         struct ipoib_cm_tx *cm;
 #endif
-        union ib_gid        dgid;
+        u8     daddr[INFINIBAND_ALEN];
         struct sk_buff_head queue;
 
-        struct neighbour   *neighbour;
         struct net_device *dev;
 
         struct list_head    list;
+        struct ipoib_neigh __rcu *hnext;
+        struct rcu_head     rcu;
+        atomic_t            refcnt;
+        unsigned long       alive;
 };
 
 #define IPOIB_UD_MTU(ib_mtu)            (ib_mtu - IPOIB_ENCAP_LEN)
@@ -394,21 +415,17 @@ static inline int ipoib_ud_need_sg(unsigned int ib_mtu)
         return IPOIB_UD_BUF_SIZE(ib_mtu) > PAGE_SIZE;
 }
 
-/*
- * We stash a pointer to our private neighbour information after our
- * hardware address in neigh->ha.  The ALIGN() expression here makes
- * sure that this pointer is stored aligned so that an unaligned
- * load is not needed to dereference it.
- */
-static inline struct ipoib_neigh **to_ipoib_neigh(struct neighbour *neigh)
+void ipoib_neigh_dtor(struct ipoib_neigh *neigh);
+static inline void ipoib_neigh_put(struct ipoib_neigh *neigh)
 {
-        return (void*) neigh + ALIGN(offsetof(struct neighbour, ha) +
-                                     INFINIBAND_ALEN, sizeof(void *));
+        if (atomic_dec_and_test(&neigh->refcnt))
+                ipoib_neigh_dtor(neigh);
 }
-
-struct ipoib_neigh *ipoib_neigh_alloc(struct neighbour *neigh,
+struct ipoib_neigh *ipoib_neigh_get(struct net_device *dev, u8 *daddr);
+struct ipoib_neigh *ipoib_neigh_alloc(u8 *daddr,
                                       struct net_device *dev);
-void ipoib_neigh_free(struct net_device *dev, struct ipoib_neigh *neigh);
+void ipoib_neigh_free(struct ipoib_neigh *neigh);
+void ipoib_del_neighs_by_gid(struct net_device *dev, u8 *gid);
 
 extern struct workqueue_struct *ipoib_workqueue;
 
@@ -425,7 +442,6 @@ static inline void ipoib_put_ah(struct ipoib_ah *ah)
 {
         kref_put(&ah->ref, ipoib_free_ah);
 }
-
 int ipoib_open(struct net_device *dev);
 int ipoib_add_pkey_attr(struct net_device *dev);
 int ipoib_add_umcast_attr(struct net_device *dev);
@@ -455,7 +471,7 @@ void ipoib_dev_cleanup(struct net_device *dev);
 
 void ipoib_mcast_join_task(struct work_struct *work);
 void ipoib_mcast_carrier_on_task(struct work_struct *work);
-void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb);
+void ipoib_mcast_send(struct net_device *dev, u8 *daddr, struct sk_buff *skb);
 
 void ipoib_mcast_restart_task(struct work_struct *work);
 int ipoib_mcast_start_thread(struct net_device *dev);
@@ -517,10 +533,10 @@ static inline int ipoib_cm_admin_enabled(struct net_device *dev)
                 test_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);
 }
 
-static inline int ipoib_cm_enabled(struct net_device *dev, struct neighbour *n)
+static inline int ipoib_cm_enabled(struct net_device *dev, u8 *hwaddr)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
-        return IPOIB_CM_SUPPORTED(n->ha) &&
+        return IPOIB_CM_SUPPORTED(hwaddr) &&
                 test_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);
 }
 
@@ -575,7 +591,7 @@ static inline int ipoib_cm_admin_enabled(struct net_device *dev)
 {
         return 0;
 }
-static inline int ipoib_cm_enabled(struct net_device *dev, struct neighbour *n)
+static inline int ipoib_cm_enabled(struct net_device *dev, u8 *hwaddr)
 
 {
         return 0;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 6d66ab0dd92a..95ecf4eadf5f 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -811,9 +811,7 @@ void ipoib_cm_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)
                 if (neigh) {
                         neigh->cm = NULL;
                         list_del(&neigh->list);
-                        if (neigh->ah)
-                                ipoib_put_ah(neigh->ah);
-                        ipoib_neigh_free(dev, neigh);
+                        ipoib_neigh_free(neigh);
 
                         tx->neigh = NULL;
                 }
@@ -1230,9 +1228,7 @@ static int ipoib_cm_tx_handler(struct ib_cm_id *cm_id,
                 if (neigh) {
                         neigh->cm = NULL;
                         list_del(&neigh->list);
-                        if (neigh->ah)
-                                ipoib_put_ah(neigh->ah);
-                        ipoib_neigh_free(dev, neigh);
+                        ipoib_neigh_free(neigh);
 
                         tx->neigh = NULL;
                 }
@@ -1279,7 +1275,7 @@ void ipoib_cm_destroy_tx(struct ipoib_cm_tx *tx)
                 list_move(&tx->list, &priv->cm.reap_list);
                 queue_work(ipoib_workqueue, &priv->cm.reap_task);
                 ipoib_dbg(priv, "Reap connection for gid %pI6\n",
-                          tx->neigh->dgid.raw);
+                          tx->neigh->daddr + 4);
                 tx->neigh = NULL;
         }
 }
@@ -1304,7 +1300,7 @@ static void ipoib_cm_tx_start(struct work_struct *work)
                 p = list_entry(priv->cm.start_list.next, typeof(*p), list);
                 list_del_init(&p->list);
                 neigh = p->neigh;
-                qpn = IPOIB_QPN(neigh->neighbour->ha);
+                qpn = IPOIB_QPN(neigh->daddr);
                 memcpy(&pathrec, &p->path->pathrec, sizeof pathrec);
 
                 spin_unlock_irqrestore(&priv->lock, flags);
@@ -1320,9 +1316,7 @@ static void ipoib_cm_tx_start(struct work_struct *work)
                         if (neigh) {
                                 neigh->cm = NULL;
                                 list_del(&neigh->list);
-                                if (neigh->ah)
-                                        ipoib_put_ah(neigh->ah);
-                                ipoib_neigh_free(dev, neigh);
+                                ipoib_neigh_free(neigh);
                         }
                         list_del(&p->list);
                         kfree(p);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index bbee4b2d7a13..97920b77a5d0 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -46,7 +46,8 @@
 #include <linux/ip.h>
 #include <linux/in.h>
 
-#include <net/dst.h>
+#include <linux/jhash.h>
+#include <net/arp.h>
 
 MODULE_AUTHOR("Roland Dreier");
 MODULE_DESCRIPTION("IP-over-InfiniBand net driver");
@@ -84,6 +85,7 @@ struct ib_sa_client ipoib_sa_client;
 
 static void ipoib_add_one(struct ib_device *device);
 static void ipoib_remove_one(struct ib_device *device);
+static void ipoib_neigh_reclaim(struct rcu_head *rp);
 
 static struct ib_client ipoib_client = {
         .name   = "ipoib",
@@ -264,30 +266,15 @@ static int __path_add(struct net_device *dev, struct ipoib_path *path)
 
 static void path_free(struct net_device *dev, struct ipoib_path *path)
 {
-        struct ipoib_dev_priv *priv = netdev_priv(dev);
-        struct ipoib_neigh *neigh, *tn;
         struct sk_buff *skb;
-        unsigned long flags;
 
         while ((skb = __skb_dequeue(&path->queue)))
                 dev_kfree_skb_irq(skb);
 
-        spin_lock_irqsave(&priv->lock, flags);
-
-        list_for_each_entry_safe(neigh, tn, &path->neigh_list, list) {
-                /*
-                 * It's safe to call ipoib_put_ah() inside priv->lock
-                 * here, because we know that path->ah will always
-                 * hold one more reference, so ipoib_put_ah() will
-                 * never do more than decrement the ref count.
-                 */
-                if (neigh->ah)
-                        ipoib_put_ah(neigh->ah);
-
-                ipoib_neigh_free(dev, neigh);
-        }
+        ipoib_dbg(netdev_priv(dev), "path_free\n");
 
-        spin_unlock_irqrestore(&priv->lock, flags);
+        /* remove all neigh connected to this path */
+        ipoib_del_neighs_by_gid(dev, path->pathrec.dgid.raw);
 
         if (path->ah)
                 ipoib_put_ah(path->ah);
@@ -458,19 +445,15 @@ static void path_rec_completion(int status,
                         }
                         kref_get(&path->ah->ref);
                         neigh->ah = path->ah;
-                        memcpy(&neigh->dgid.raw, &path->pathrec.dgid.raw,
-                               sizeof(union ib_gid));
 
-                        if (ipoib_cm_enabled(dev, neigh->neighbour)) {
+                        if (ipoib_cm_enabled(dev, neigh->daddr)) {
                                 if (!ipoib_cm_get(neigh))
                                         ipoib_cm_set(neigh, ipoib_cm_create_tx(dev,
                                                                                path,
                                                                                neigh));
                                 if (!ipoib_cm_get(neigh)) {
                                         list_del(&neigh->list);
-                                        if (neigh->ah)
-                                                ipoib_put_ah(neigh->ah);
-                                        ipoib_neigh_free(dev, neigh);
+                                        ipoib_neigh_free(neigh);
                                         continue;
                                 }
                         }
@@ -555,15 +538,15 @@ static int path_rec_start(struct net_device *dev,
         return 0;
 }
 
-/* called with rcu_read_lock */
-static void neigh_add_path(struct sk_buff *skb, struct neighbour *n, struct net_device *dev)
+static void neigh_add_path(struct sk_buff *skb, u8 *daddr,
+                           struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ipoib_path *path;
         struct ipoib_neigh *neigh;
         unsigned long flags;
 
-        neigh = ipoib_neigh_alloc(n, skb->dev);
+        neigh = ipoib_neigh_alloc(daddr, dev);
         if (!neigh) {
                 ++dev->stats.tx_dropped;
                 dev_kfree_skb_any(skb);
@@ -572,9 +555,9 @@ static void neigh_add_path(struct sk_buff *skb, struct neighbour *n, struct net_
 
         spin_lock_irqsave(&priv->lock, flags);
 
-        path = __path_find(dev, n->ha + 4);
+        path = __path_find(dev, daddr + 4);
         if (!path) {
-                path = path_rec_create(dev, n->ha + 4);
+                path = path_rec_create(dev, daddr + 4);
                 if (!path)
                         goto err_path;
 
@@ -586,17 +569,13 @@ static void neigh_add_path(struct sk_buff *skb, struct neighbour *n, struct net_
         if (path->ah) {
                 kref_get(&path->ah->ref);
                 neigh->ah = path->ah;
-                memcpy(&neigh->dgid.raw, &path->pathrec.dgid.raw,
-                       sizeof(union ib_gid));
 
-                if (ipoib_cm_enabled(dev, neigh->neighbour)) {
+                if (ipoib_cm_enabled(dev, neigh->daddr)) {
                         if (!ipoib_cm_get(neigh))
                                 ipoib_cm_set(neigh, ipoib_cm_create_tx(dev, path, neigh));
                         if (!ipoib_cm_get(neigh)) {
                                 list_del(&neigh->list);
-                                if (neigh->ah)
-                                        ipoib_put_ah(neigh->ah);
-                                ipoib_neigh_free(dev, neigh);
+                                ipoib_neigh_free(neigh);
                                 goto err_drop;
                         }
                         if (skb_queue_len(&neigh->queue) < IPOIB_MAX_PATH_REC_QUEUE)
@@ -608,7 +587,8 @@ static void neigh_add_path(struct sk_buff *skb, struct neighbour *n, struct net_
                         }
                 } else {
                         spin_unlock_irqrestore(&priv->lock, flags);
-                        ipoib_send(dev, skb, path->ah, IPOIB_QPN(n->ha));
+                        ipoib_send(dev, skb, path->ah, IPOIB_QPN(daddr));
+                        ipoib_neigh_put(neigh);
                         return;
                 }
         } else {
@@ -621,35 +601,20 @@ static void neigh_add_path(struct sk_buff *skb, struct neighbour *n, struct net_
         }
 
         spin_unlock_irqrestore(&priv->lock, flags);
+        ipoib_neigh_put(neigh);
         return;
 
 err_list:
         list_del(&neigh->list);
 
 err_path:
-        ipoib_neigh_free(dev, neigh);
+        ipoib_neigh_free(neigh);
 err_drop:
         ++dev->stats.tx_dropped;
         dev_kfree_skb_any(skb);
 
         spin_unlock_irqrestore(&priv->lock, flags);
-}
-
-/* called with rcu_read_lock */
-static void ipoib_path_lookup(struct sk_buff *skb, struct neighbour *n, struct net_device *dev)
-{
-        struct ipoib_dev_priv *priv = netdev_priv(skb->dev);
-
-        /* Look up path record for unicasts */
-        if (n->ha[4] != 0xff) {
-                neigh_add_path(skb, n, dev);
-                return;
-        }
-
-        /* Add in the P_Key for multicasts */
-        n->ha[8] = (priv->pkey >> 8) & 0xff;
-        n->ha[9] = priv->pkey & 0xff;
-        ipoib_mcast_send(dev, n->ha + 4, skb);
+        ipoib_neigh_put(neigh);
 }
 
 static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
@@ -710,96 +675,80 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ipoib_neigh *neigh;
-        struct neighbour *n = NULL;
+        struct ipoib_cb *cb = (struct ipoib_cb *) skb->cb;
+        struct ipoib_header *header;
         unsigned long flags;
 
-        rcu_read_lock();
-        if (likely(skb_dst(skb))) {
-                n = dst_neigh_lookup_skb(skb_dst(skb), skb);
-                if (!n) {
+        header = (struct ipoib_header *) skb->data;
+
+        if (unlikely(cb->hwaddr[4] == 0xff)) {
+                /* multicast, arrange "if" according to probability */
+                if ((header->proto != htons(ETH_P_IP)) &&
+                    (header->proto != htons(ETH_P_IPV6)) &&
+                    (header->proto != htons(ETH_P_ARP)) &&
+                    (header->proto != htons(ETH_P_RARP))) {
+                        /* ethertype not supported by IPoIB */
                         ++dev->stats.tx_dropped;
                         dev_kfree_skb_any(skb);
-                        goto unlock;
+                        return NETDEV_TX_OK;
                 }
+                /* Add in the P_Key for multicast*/
+                cb->hwaddr[8] = (priv->pkey >> 8) & 0xff;
+                cb->hwaddr[9] = priv->pkey & 0xff;
+
+                neigh = ipoib_neigh_get(dev, cb->hwaddr);
+                if (likely(neigh))
+                        goto send_using_neigh;
+                ipoib_mcast_send(dev, cb->hwaddr, skb);
+                return NETDEV_TX_OK;
         }
-        if (likely(n)) {
-                if (unlikely(!*to_ipoib_neigh(n))) {
-                        ipoib_path_lookup(skb, n, dev);
-                        goto unlock;
-                }
-
-                neigh = *to_ipoib_neigh(n);
 
-                if (unlikely((memcmp(&neigh->dgid.raw,
-                                     n->ha + 4,
-                                     sizeof(union ib_gid))) ||
-                             (neigh->dev != dev))) {
-                        spin_lock_irqsave(&priv->lock, flags);
-                        /*
-                         * It's safe to call ipoib_put_ah() inside
-                         * priv->lock here, because we know that
-                         * path->ah will always hold one more reference,
-                         * so ipoib_put_ah() will never do more than
-                         * decrement the ref count.
-                         */
-                        if (neigh->ah)
-                                ipoib_put_ah(neigh->ah);
-                        list_del(&neigh->list);
-                        ipoib_neigh_free(dev, neigh);
-                        spin_unlock_irqrestore(&priv->lock, flags);
-                        ipoib_path_lookup(skb, n, dev);
-                        goto unlock;
+        /* unicast, arrange "switch" according to probability */
+        switch (header->proto) {
+        case htons(ETH_P_IP):
+        case htons(ETH_P_IPV6):
+                neigh = ipoib_neigh_get(dev, cb->hwaddr);
+                if (unlikely(!neigh)) {
+                        neigh_add_path(skb, cb->hwaddr, dev);
+                        return NETDEV_TX_OK;
                 }
+                break;
+        case htons(ETH_P_ARP):
+        case htons(ETH_P_RARP):
+                /* for unicast ARP and RARP should always perform path find */
+                unicast_arp_send(skb, dev, cb);
+                return NETDEV_TX_OK;
+        default:
+                /* ethertype not supported by IPoIB */
+                ++dev->stats.tx_dropped;
+                dev_kfree_skb_any(skb);
+                return NETDEV_TX_OK;
+        }
 
-                if (ipoib_cm_get(neigh)) {
-                        if (ipoib_cm_up(neigh)) {
-                                ipoib_cm_send(dev, skb, ipoib_cm_get(neigh));
-                                goto unlock;
-                        }
-                } else if (neigh->ah) {
-                        ipoib_send(dev, skb, neigh->ah, IPOIB_QPN(n->ha));
-                        goto unlock;
+send_using_neigh:
+        /* note we now hold a ref to neigh */
+        if (ipoib_cm_get(neigh)) {
+                if (ipoib_cm_up(neigh)) {
+                        ipoib_cm_send(dev, skb, ipoib_cm_get(neigh));
+                        goto unref;
                 }
+        } else if (neigh->ah) {
+                ipoib_send(dev, skb, neigh->ah, IPOIB_QPN(cb->hwaddr));
+                goto unref;
+        }
 
-                if (skb_queue_len(&neigh->queue) < IPOIB_MAX_PATH_REC_QUEUE) {
-                        spin_lock_irqsave(&priv->lock, flags);
-                        __skb_queue_tail(&neigh->queue, skb);
-                        spin_unlock_irqrestore(&priv->lock, flags);
-                } else {
-                        ++dev->stats.tx_dropped;
-                        dev_kfree_skb_any(skb);
-                }
+        if (skb_queue_len(&neigh->queue) < IPOIB_MAX_PATH_REC_QUEUE) {
+                spin_lock_irqsave(&priv->lock, flags);
+                __skb_queue_tail(&neigh->queue, skb);
+                spin_unlock_irqrestore(&priv->lock, flags);
         } else {
-                struct ipoib_cb *cb = (struct ipoib_cb *) skb->cb;
-
-                if (cb->hwaddr[4] == 0xff) {
-                        /* Add in the P_Key for multicast*/
-                        cb->hwaddr[8] = (priv->pkey >> 8) & 0xff;
-                        cb->hwaddr[9] = priv->pkey & 0xff;
+                ++dev->stats.tx_dropped;
+                dev_kfree_skb_any(skb);
+        }
 
-                        ipoib_mcast_send(dev, cb->hwaddr + 4, skb);
-                } else {
-                        /* unicast GID -- should be ARP or RARP reply */
-
-                        if ((be16_to_cpup((__be16 *) skb->data) != ETH_P_ARP) &&
-                            (be16_to_cpup((__be16 *) skb->data) != ETH_P_RARP)) {
-                                ipoib_warn(priv, "Unicast, no %s: type %04x, QPN %06x %pI6\n",
-                                           skb_dst(skb) ? "neigh" : "dst",
-                                           be16_to_cpup((__be16 *) skb->data),
-                                           IPOIB_QPN(cb->hwaddr),
-                                           cb->hwaddr + 4);
-                                dev_kfree_skb_any(skb);
-                                ++dev->stats.tx_dropped;
-                                goto unlock;
-                        }
+unref:
+        ipoib_neigh_put(neigh);
 
-                        unicast_arp_send(skb, dev, cb);
-                }
-        }
-unlock:
-        if (n)
-                neigh_release(n);
-        rcu_read_unlock();
         return NETDEV_TX_OK;
 }
 
@@ -821,6 +770,7 @@ static int ipoib_hard_header(struct sk_buff *skb,
                              const void *daddr, const void *saddr, unsigned len)
 {
         struct ipoib_header *header;
+        struct ipoib_cb *cb = (struct ipoib_cb *) skb->cb;
 
         header = (struct ipoib_header *) skb_push(skb, sizeof *header);
 
@@ -828,14 +778,11 @@ static int ipoib_hard_header(struct sk_buff *skb,
         header->reserved = 0;
 
         /*
-         * If we don't have a dst_entry structure, stuff the
+         * we don't rely on dst_entry structure,  always stuff the
          * destination address into skb->cb so we can figure out where
          * to send the packet later.
          */
-        if (!skb_dst(skb)) {
-                struct ipoib_cb *cb = (struct ipoib_cb *) skb->cb;
-                memcpy(cb->hwaddr, daddr, INFINIBAND_ALEN);
-        }
+        memcpy(cb->hwaddr, daddr, INFINIBAND_ALEN);
 
         return 0;
 }
@@ -852,86 +799,438 @@ static void ipoib_set_mcast_list(struct net_device *dev)
         queue_work(ipoib_workqueue, &priv->restart_task);
 }
 
-static void ipoib_neigh_cleanup(struct neighbour *n)
+static u32 ipoib_addr_hash(struct ipoib_neigh_hash *htbl, u8 *daddr)
 {
-        struct ipoib_neigh *neigh;
-        struct ipoib_dev_priv *priv = netdev_priv(n->dev);
+        /*
+         * Use only the address parts that contributes to spreading
+         * The subnet prefix is not used as one can not connect to
+         * same remote port (GUID) using the same remote QPN via two
+         * different subnets.
+         */
+         /* qpn octets[1:4) & port GUID octets[12:20) */
+        u32 *daddr_32 = (u32 *) daddr;
+        u32 hv;
+
+        hv = jhash_3words(daddr_32[3], daddr_32[4], 0xFFFFFF & daddr_32[0], 0);
+        return hv & htbl->mask;
+}
+
+struct ipoib_neigh *ipoib_neigh_get(struct net_device *dev, u8 *daddr)
+{
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
+        struct ipoib_neigh_table *ntbl = &priv->ntbl;
+        struct ipoib_neigh_hash *htbl;
+        struct ipoib_neigh *neigh = NULL;
+        u32 hash_val;
+
+        rcu_read_lock_bh();
+
+        htbl = rcu_dereference_bh(ntbl->htbl);
+
+        if (!htbl)
+                goto out_unlock;
+
+        hash_val = ipoib_addr_hash(htbl, daddr);
+        for (neigh = rcu_dereference_bh(htbl->buckets[hash_val]);
+             neigh != NULL;
+             neigh = rcu_dereference_bh(neigh->hnext)) {
+                if (memcmp(daddr, neigh->daddr, INFINIBAND_ALEN) == 0) {
+                        /* found, take one ref on behalf of the caller */
+                        if (!atomic_inc_not_zero(&neigh->refcnt)) {
+                                /* deleted */
+                                neigh = NULL;
+                                goto out_unlock;
+                        }
+                        neigh->alive = jiffies;
+                        goto out_unlock;
+                }
+        }
+
+out_unlock:
+        rcu_read_unlock_bh();
+        return neigh;
+}
+
+static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv)
+{
+        struct ipoib_neigh_table *ntbl = &priv->ntbl;
+        struct ipoib_neigh_hash *htbl;
+        unsigned long neigh_obsolete;
+        unsigned long dt;
         unsigned long flags;
-        struct ipoib_ah *ah = NULL;
+        int i;
 
-        neigh = *to_ipoib_neigh(n);
-        if (neigh)
-                priv = netdev_priv(neigh->dev);
-        else
+        if (test_bit(IPOIB_STOP_NEIGH_GC, &priv->flags))
                 return;
-        ipoib_dbg(priv,
-                  "neigh_cleanup for %06x %pI6\n",
-                  IPOIB_QPN(n->ha),
-                  n->ha + 4);
 
-        spin_lock_irqsave(&priv->lock, flags);
+        write_lock_bh(&ntbl->rwlock);
+
+        htbl = rcu_dereference_protected(ntbl->htbl,
+                                         lockdep_is_held(&ntbl->rwlock));
+
+        if (!htbl)
+                goto out_unlock;
+
+        /* neigh is obsolete if it was idle for two GC periods */
+        dt = 2 * arp_tbl.gc_interval;
+        neigh_obsolete = jiffies - dt;
+        /* handle possible race condition */
+        if (test_bit(IPOIB_STOP_NEIGH_GC, &priv->flags))
+                goto out_unlock;
+
+        for (i = 0; i < htbl->size; i++) {
+                struct ipoib_neigh *neigh;
+                struct ipoib_neigh __rcu **np = &htbl->buckets[i];
+
+                while ((neigh = rcu_dereference_protected(*np,
+                                                          lockdep_is_held(&ntbl->rwlock))) != NULL) {
+                        /* was the neigh idle for two GC periods */
+                        if (time_after(neigh_obsolete, neigh->alive)) {
+                                rcu_assign_pointer(*np,
+                                                   rcu_dereference_protected(neigh->hnext,
+                                                                             lockdep_is_held(&ntbl->rwlock)));
+                                /* remove from path/mc list */
+                                spin_lock_irqsave(&priv->lock, flags);
+                                list_del(&neigh->list);
+                                spin_unlock_irqrestore(&priv->lock, flags);
+                                call_rcu(&neigh->rcu, ipoib_neigh_reclaim);
+                        } else {
+                                np = &neigh->hnext;
+                        }
 
-        if (neigh->ah)
-                ah = neigh->ah;
-        list_del(&neigh->list);
-        ipoib_neigh_free(n->dev, neigh);
+                }
+        }
 
-        spin_unlock_irqrestore(&priv->lock, flags);
+out_unlock:
+        write_unlock_bh(&ntbl->rwlock);
+}
 
-        if (ah)
-                ipoib_put_ah(ah);
+static void ipoib_reap_neigh(struct work_struct *work)
+{
+        struct ipoib_dev_priv *priv =
+                container_of(work, struct ipoib_dev_priv, neigh_reap_task.work);
+
+        __ipoib_reap_neigh(priv);
+
+        if (!test_bit(IPOIB_STOP_NEIGH_GC, &priv->flags))
+                queue_delayed_work(ipoib_workqueue, &priv->neigh_reap_task,
+                                   arp_tbl.gc_interval);
 }
 
-struct ipoib_neigh *ipoib_neigh_alloc(struct neighbour *neighbour,
+
+static struct ipoib_neigh *ipoib_neigh_ctor(u8 *daddr,
                                       struct net_device *dev)
 {
         struct ipoib_neigh *neigh;
 
-        neigh = kmalloc(sizeof *neigh, GFP_ATOMIC);
+        neigh = kzalloc(sizeof *neigh, GFP_ATOMIC);
         if (!neigh)
                 return NULL;
 
-        neigh->neighbour = neighbour;
         neigh->dev = dev;
-        memset(&neigh->dgid.raw, 0, sizeof (union ib_gid));
-        *to_ipoib_neigh(neighbour) = neigh;
+        memcpy(&neigh->daddr, daddr, sizeof(neigh->daddr));
         skb_queue_head_init(&neigh->queue);
+        INIT_LIST_HEAD(&neigh->list);
         ipoib_cm_set(neigh, NULL);
+        /* one ref on behalf of the caller */
+        atomic_set(&neigh->refcnt, 1);
+
+        return neigh;
+}
+
+struct ipoib_neigh *ipoib_neigh_alloc(u8 *daddr,
+                                      struct net_device *dev)
+{
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
+        struct ipoib_neigh_table *ntbl = &priv->ntbl;
+        struct ipoib_neigh_hash *htbl;
+        struct ipoib_neigh *neigh;
+        u32 hash_val;
+
+        write_lock_bh(&ntbl->rwlock);
+
+        htbl = rcu_dereference_protected(ntbl->htbl,
+                                         lockdep_is_held(&ntbl->rwlock));
+        if (!htbl) {
+                neigh = NULL;
+                goto out_unlock;
+        }
+
+        /* need to add a new neigh, but maybe some other thread succeeded?
+         * recalc hash, maybe hash resize took place so we do a search
+         */
+        hash_val = ipoib_addr_hash(htbl, daddr);
+        for (neigh = rcu_dereference_protected(htbl->buckets[hash_val],
+                                               lockdep_is_held(&ntbl->rwlock));
+             neigh != NULL;
+             neigh = rcu_dereference_protected(neigh->hnext,
+                                               lockdep_is_held(&ntbl->rwlock))) {
+                if (memcmp(daddr, neigh->daddr, INFINIBAND_ALEN) == 0) {
+                        /* found, take one ref on behalf of the caller */
+                        if (!atomic_inc_not_zero(&neigh->refcnt)) {
+                                /* deleted */
+                                neigh = NULL;
+                                break;
+                        }
+                        neigh->alive = jiffies;
+                        goto out_unlock;
+                }
+        }
+
+        neigh = ipoib_neigh_ctor(daddr, dev);
+        if (!neigh)
+                goto out_unlock;
+
+        /* one ref on behalf of the hash table */
+        atomic_inc(&neigh->refcnt);
+        neigh->alive = jiffies;
+        /* put in hash */
+        rcu_assign_pointer(neigh->hnext,
+                           rcu_dereference_protected(htbl->buckets[hash_val],
+                                                     lockdep_is_held(&ntbl->rwlock)));
+        rcu_assign_pointer(htbl->buckets[hash_val], neigh);
+        atomic_inc(&ntbl->entries);
+
+out_unlock:
+        write_unlock_bh(&ntbl->rwlock);
 
         return neigh;
 }
 
-void ipoib_neigh_free(struct net_device *dev, struct ipoib_neigh *neigh)
+void ipoib_neigh_dtor(struct ipoib_neigh *neigh)
 {
+        /* neigh reference count was dropprd to zero */
+        struct net_device *dev = neigh->dev;
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct sk_buff *skb;
-        *to_ipoib_neigh(neigh->neighbour) = NULL;
+        if (neigh->ah)
+                ipoib_put_ah(neigh->ah);
         while ((skb = __skb_dequeue(&neigh->queue))) {
                 ++dev->stats.tx_dropped;
                 dev_kfree_skb_any(skb);
         }
         if (ipoib_cm_get(neigh))
                 ipoib_cm_destroy_tx(ipoib_cm_get(neigh));
+        ipoib_dbg(netdev_priv(dev),
+                  "neigh free for %06x %pI6\n",
+                  IPOIB_QPN(neigh->daddr),
+                  neigh->daddr + 4);
         kfree(neigh);
+        if (atomic_dec_and_test(&priv->ntbl.entries)) {
+                if (test_bit(IPOIB_NEIGH_TBL_FLUSH, &priv->flags))
+                        complete(&priv->ntbl.flushed);
+        }
+}
+
+static void ipoib_neigh_reclaim(struct rcu_head *rp)
+{
+        /* Called as a result of removal from hash table */
+        struct ipoib_neigh *neigh = container_of(rp, struct ipoib_neigh, rcu);
+        /* note TX context may hold another ref */
+        ipoib_neigh_put(neigh);
 }
 
-static int ipoib_neigh_setup_dev(struct net_device *dev, struct neigh_parms *parms)
+void ipoib_neigh_free(struct ipoib_neigh *neigh)
 {
-        parms->neigh_cleanup = ipoib_neigh_cleanup;
+        struct net_device *dev = neigh->dev;
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
+        struct ipoib_neigh_table *ntbl = &priv->ntbl;
+        struct ipoib_neigh_hash *htbl;
+        struct ipoib_neigh __rcu **np;
+        struct ipoib_neigh *n;
+        u32 hash_val;
+
+        write_lock_bh(&ntbl->rwlock);
+
+        htbl = rcu_dereference_protected(ntbl->htbl,
+                                        lockdep_is_held(&ntbl->rwlock));
+        if (!htbl)
+                goto out_unlock;
+
+        hash_val = ipoib_addr_hash(htbl, neigh->daddr);
+        np = &htbl->buckets[hash_val];
+        for (n = rcu_dereference_protected(*np,
+                                            lockdep_is_held(&ntbl->rwlock));
+             n != NULL;
+             n = rcu_dereference_protected(neigh->hnext,
+                                        lockdep_is_held(&ntbl->rwlock))) {
+                if (n == neigh) {
+                        /* found */
+                        rcu_assign_pointer(*np,
+                                           rcu_dereference_protected(neigh->hnext,
+                                                                     lockdep_is_held(&ntbl->rwlock)));
+                        call_rcu(&neigh->rcu, ipoib_neigh_reclaim);
+                        goto out_unlock;
+                } else {
+                        np = &n->hnext;
+                }
+        }
+
+out_unlock:
+        write_unlock_bh(&ntbl->rwlock);
+
+}
+
+static int ipoib_neigh_hash_init(struct ipoib_dev_priv *priv)
+{
+        struct ipoib_neigh_table *ntbl = &priv->ntbl;
+        struct ipoib_neigh_hash *htbl;
+        struct ipoib_neigh **buckets;
+        u32 size;
+
+        clear_bit(IPOIB_NEIGH_TBL_FLUSH, &priv->flags);
+        ntbl->htbl = NULL;
+        rwlock_init(&ntbl->rwlock);
+        htbl = kzalloc(sizeof(*htbl), GFP_KERNEL);
+        if (!htbl)
+                return -ENOMEM;
+        set_bit(IPOIB_STOP_NEIGH_GC, &priv->flags);
+        size = roundup_pow_of_two(arp_tbl.gc_thresh3);
+        buckets = kzalloc(size * sizeof(*buckets), GFP_KERNEL);
+        if (!buckets) {
+                kfree(htbl);
+                return -ENOMEM;
+        }
+        htbl->size = size;
+        htbl->mask = (size - 1);
+        htbl->buckets = buckets;
+        ntbl->htbl = htbl;
+        atomic_set(&ntbl->entries, 0);
+
+        /* start garbage collection */
+        clear_bit(IPOIB_STOP_NEIGH_GC, &priv->flags);
+        queue_delayed_work(ipoib_workqueue, &priv->neigh_reap_task,
+                           arp_tbl.gc_interval);
 
         return 0;
 }
 
+static void neigh_hash_free_rcu(struct rcu_head *head)
+{
+        struct ipoib_neigh_hash *htbl = container_of(head,
+                                                    struct ipoib_neigh_hash,
+                                                    rcu);
+        struct ipoib_neigh __rcu **buckets = htbl->buckets;
+
+        kfree(buckets);
+        kfree(htbl);
+}
+
+void ipoib_del_neighs_by_gid(struct net_device *dev, u8 *gid)
+{
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
+        struct ipoib_neigh_table *ntbl = &priv->ntbl;
+        struct ipoib_neigh_hash *htbl;
+        unsigned long flags;
+        int i;
+
+        /* remove all neigh connected to a given path or mcast */
+        write_lock_bh(&ntbl->rwlock);
+
+        htbl = rcu_dereference_protected(ntbl->htbl,
+                                         lockdep_is_held(&ntbl->rwlock));
+
+        if (!htbl)
+                goto out_unlock;
+
+        for (i = 0; i < htbl->size; i++) {
+                struct ipoib_neigh *neigh;
+                struct ipoib_neigh __rcu **np = &htbl->buckets[i];
+
+                while ((neigh = rcu_dereference_protected(*np,
+                                                          lockdep_is_held(&ntbl->rwlock))) != NULL) {
+                        /* delete neighs belong to this parent */
+                        if (!memcmp(gid, neigh->daddr + 4, sizeof (union ib_gid))) {
+                                rcu_assign_pointer(*np,
+                                                   rcu_dereference_protected(neigh->hnext,
+                                                                             lockdep_is_held(&ntbl->rwlock)));
+                                /* remove from parent list */
+                                spin_lock_irqsave(&priv->lock, flags);
+                                list_del(&neigh->list);
+                                spin_unlock_irqrestore(&priv->lock, flags);
+                                call_rcu(&neigh->rcu, ipoib_neigh_reclaim);
+                        } else {
+                                np = &neigh->hnext;
+                        }
+
+                }
+        }
+out_unlock:
+        write_unlock_bh(&ntbl->rwlock);
+}
+
+static void ipoib_flush_neighs(struct ipoib_dev_priv *priv)
+{
+        struct ipoib_neigh_table *ntbl = &priv->ntbl;
+        struct ipoib_neigh_hash *htbl;
+        unsigned long flags;
+        int i;
+
+        write_lock_bh(&ntbl->rwlock);
+
+        htbl = rcu_dereference_protected(ntbl->htbl,
+                                        lockdep_is_held(&ntbl->rwlock));
+        if (!htbl)
+                goto out_unlock;
+
+        for (i = 0; i < htbl->size; i++) {
+                struct ipoib_neigh *neigh;
+                struct ipoib_neigh __rcu **np = &htbl->buckets[i];
+
+                while ((neigh = rcu_dereference_protected(*np,
+                                                          lockdep_is_held(&ntbl->rwlock))) != NULL) {
+                        rcu_assign_pointer(*np,
+                                           rcu_dereference_protected(neigh->hnext,
+                                                                     lockdep_is_held(&ntbl->rwlock)));
+                        /* remove from path/mc list */
+                        spin_lock_irqsave(&priv->lock, flags);
+                        list_del(&neigh->list);
+                        spin_unlock_irqrestore(&priv->lock, flags);
+                        call_rcu(&neigh->rcu, ipoib_neigh_reclaim);
+                }
+        }
+
+        rcu_assign_pointer(ntbl->htbl, NULL);
+        call_rcu(&htbl->rcu, neigh_hash_free_rcu);
+
+out_unlock:
+        write_unlock_bh(&ntbl->rwlock);
+}
+
+static void ipoib_neigh_hash_uninit(struct net_device *dev)
+{
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
+        int stopped;
+
+        ipoib_dbg(priv, "ipoib_neigh_hash_uninit\n");
+        init_completion(&priv->ntbl.flushed);
+        set_bit(IPOIB_NEIGH_TBL_FLUSH, &priv->flags);
+
+        /* Stop GC if called at init fail need to cancel work */
+        stopped = test_and_set_bit(IPOIB_STOP_NEIGH_GC, &priv->flags);
+        if (!stopped)
+                cancel_delayed_work(&priv->neigh_reap_task);
+
+        if (atomic_read(&priv->ntbl.entries)) {
+                ipoib_flush_neighs(priv);
+                wait_for_completion(&priv->ntbl.flushed);
+        }
+}
+
+
 int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
 
+        if (ipoib_neigh_hash_init(priv) < 0)
+                goto out;
         /* Allocate RX/TX "rings" to hold queued skbs */
         priv->rx_ring = kzalloc(ipoib_recvq_size * sizeof *priv->rx_ring,
                                 GFP_KERNEL);
         if (!priv->rx_ring) {
                 printk(KERN_WARNING "%s: failed to allocate RX ring (%d entries)\n",
                        ca->name, ipoib_recvq_size);
-                goto out;
+                goto out_neigh_hash_cleanup;
         }
 
         priv->tx_ring = vzalloc(ipoib_sendq_size * sizeof *priv->tx_ring);
@@ -954,6 +1253,8 @@ out_tx_ring_cleanup:
 out_rx_ring_cleanup:
         kfree(priv->rx_ring);
 
+out_neigh_hash_cleanup:
+        ipoib_neigh_hash_uninit(dev);
 out:
         return -ENOMEM;
 }
@@ -966,6 +1267,9 @@ void ipoib_dev_cleanup(struct net_device *dev)
 
         /* Delete any child interfaces first */
         list_for_each_entry_safe(cpriv, tcpriv, &priv->child_intfs, list) {
+                /* Stop GC on child */
+                set_bit(IPOIB_STOP_NEIGH_GC, &cpriv->flags);
+                cancel_delayed_work(&cpriv->neigh_reap_task);
                 unregister_netdev(cpriv->dev);
                 ipoib_dev_cleanup(cpriv->dev);
                 free_netdev(cpriv->dev);
@@ -978,6 +1282,8 @@ void ipoib_dev_cleanup(struct net_device *dev)
 
         priv->rx_ring = NULL;
         priv->tx_ring = NULL;
+
+        ipoib_neigh_hash_uninit(dev);
 }
 
 static const struct header_ops ipoib_header_ops = {
@@ -992,7 +1298,6 @@ static const struct net_device_ops ipoib_netdev_ops = {
         .ndo_start_xmit          = ipoib_start_xmit,
         .ndo_tx_timeout          = ipoib_timeout,
         .ndo_set_rx_mode         = ipoib_set_mcast_list,
-        .ndo_neigh_setup         = ipoib_neigh_setup_dev,
 };
 
 static void ipoib_setup(struct net_device *dev)
@@ -1041,6 +1346,7 @@ static void ipoib_setup(struct net_device *dev)
         INIT_WORK(&priv->flush_heavy,   ipoib_ib_dev_flush_heavy);
         INIT_WORK(&priv->restart_task, ipoib_mcast_restart_task);
         INIT_DELAYED_WORK(&priv->ah_reap_task, ipoib_reap_ah);
+        INIT_DELAYED_WORK(&priv->neigh_reap_task, ipoib_reap_neigh);
 }
 
 struct ipoib_dev_priv *ipoib_intf_alloc(const char *name)
@@ -1281,6 +1587,9 @@ sysfs_failed:
 
 register_failed:
         ib_unregister_event_handler(&priv->event_handler);
+        /* Stop GC if started before flush */
+        set_bit(IPOIB_STOP_NEIGH_GC, &priv->flags);
+        cancel_delayed_work(&priv->neigh_reap_task);
         flush_workqueue(ipoib_workqueue);
 
 event_failed:
@@ -1347,6 +1656,9 @@ static void ipoib_remove_one(struct ib_device *device)
                 dev_change_flags(priv->dev, priv->dev->flags & ~IFF_UP);
                 rtnl_unlock();
 
+                /* Stop GC */
+                set_bit(IPOIB_STOP_NEIGH_GC, &priv->flags);
+                cancel_delayed_work(&priv->neigh_reap_task);
                 flush_workqueue(ipoib_workqueue);
 
                 unregister_netdev(priv->dev);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 7cecb16d3d48..13f4aa7593c8 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -69,28 +69,13 @@ struct ipoib_mcast_iter {
 static void ipoib_mcast_free(struct ipoib_mcast *mcast)
 {
         struct net_device *dev = mcast->dev;
-        struct ipoib_dev_priv *priv = netdev_priv(dev);
-        struct ipoib_neigh *neigh, *tmp;
         int tx_dropped = 0;
 
         ipoib_dbg_mcast(netdev_priv(dev), "deleting multicast group %pI6\n",
                         mcast->mcmember.mgid.raw);
 
-        spin_lock_irq(&priv->lock);
-
-        list_for_each_entry_safe(neigh, tmp, &mcast->neigh_list, list) {
-                /*
-                 * It's safe to call ipoib_put_ah() inside priv->lock
-                 * here, because we know that mcast->ah will always
-                 * hold one more reference, so ipoib_put_ah() will
-                 * never do more than decrement the ref count.
-                 */
-                if (neigh->ah)
-                        ipoib_put_ah(neigh->ah);
-                ipoib_neigh_free(dev, neigh);
-        }
-
-        spin_unlock_irq(&priv->lock);
+        /* remove all neigh connected to this mcast */
+        ipoib_del_neighs_by_gid(dev, mcast->mcmember.mgid.raw);
 
         if (mcast->ah)
                 ipoib_put_ah(mcast->ah);
@@ -655,17 +640,12 @@ static int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast)
         return 0;
 }
 
-void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)
+void ipoib_mcast_send(struct net_device *dev, u8 *daddr, struct sk_buff *skb)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
-        struct dst_entry *dst = skb_dst(skb);
         struct ipoib_mcast *mcast;
-        struct neighbour *n;
         unsigned long flags;
-
-        n = NULL;
-        if (dst)
-                n = dst_neigh_lookup_skb(dst, skb);
+        void *mgid = daddr + 4;
 
         spin_lock_irqsave(&priv->lock, flags);
 
@@ -721,28 +701,29 @@ void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)
 
 out:
         if (mcast && mcast->ah) {
-                if (n) {
-                        if (!*to_ipoib_neigh(n)) {
-                                struct ipoib_neigh *neigh;
-
-                                neigh = ipoib_neigh_alloc(n, skb->dev);
-                                if (neigh) {
-                                        kref_get(&mcast->ah->ref);
-                                        neigh->ah       = mcast->ah;
-                                        list_add_tail(&neigh->list,
-                                                      &mcast->neigh_list);
-                                }
+                struct ipoib_neigh *neigh;
+
+                spin_unlock_irqrestore(&priv->lock, flags);
+                neigh = ipoib_neigh_get(dev, daddr);
+                spin_lock_irqsave(&priv->lock, flags);
+                if (!neigh) {
+                        spin_unlock_irqrestore(&priv->lock, flags);
+                        neigh = ipoib_neigh_alloc(daddr, dev);
+                        spin_lock_irqsave(&priv->lock, flags);
+                        if (neigh) {
+                                kref_get(&mcast->ah->ref);
+                                neigh->ah       = mcast->ah;
+                                list_add_tail(&neigh->list, &mcast->neigh_list);
                         }
-                        neigh_release(n);
                 }
                 spin_unlock_irqrestore(&priv->lock, flags);
                 ipoib_send(dev, skb, mcast->ah, IB_MULTICAST_QPN);
+                if (neigh)
+                        ipoib_neigh_put(neigh);
                 return;
         }
 
 unlock:
-        if (n)
-                neigh_release(n);
         spin_unlock_irqrestore(&priv->lock, flags);
 }
 
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index 09a089996ded..d7a7e54f6465 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -878,7 +878,7 @@ static int __init hp_sdc_init(void)
 #endif
 
         errstr = "IRQ not available for";
-        if (request_irq(hp_sdc.irq, &hp_sdc_isr, IRQF_SHARED|IRQF_SAMPLE_RANDOM,
+        if (request_irq(hp_sdc.irq, &hp_sdc_isr, IRQF_SHARED,
                         "HP SDC", &hp_sdc))
                 goto err1;
 
diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
index c08fc605e56b..fa6ca4733725 100644
--- a/drivers/isdn/hardware/mISDN/avmfritz.c
+++ b/drivers/isdn/hardware/mISDN/avmfritz.c
@@ -449,7 +449,8 @@ hdlc_fill_fifo(struct bchannel *bch)
 {
         struct fritzcard *fc = bch->hw;
         struct hdlc_hw *hdlc;
-        int count, fs, cnt = 0, idx, fillempty = 0;
+        int count, fs, cnt = 0, idx;
+        bool fillempty = false;
         u8 *p;
         u32 *ptr, val, addr;
 
@@ -462,7 +463,7 @@ hdlc_fill_fifo(struct bchannel *bch)
                         return;
                 count = fs;
                 p = bch->fill;
-                fillempty = 1;
+                fillempty = true;
         } else {
                 count = bch->tx_skb->len - bch->tx_idx;
                 if (count <= 0)
@@ -477,7 +478,7 @@ hdlc_fill_fifo(struct bchannel *bch)
                         hdlc->ctrl.sr.cmd |= HDLC_CMD_XME;
         }
         ptr = (u32 *)p;
-        if (fillempty) {
+        if (!fillempty) {
                 pr_debug("%s.B%d: %d/%d/%d", fc->name, bch->nr, count,
                          bch->tx_idx, bch->tx_skb->len);
                 bch->tx_idx += count;
diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c
index f88f948efee2..ea0550eafe7d 100644
--- a/drivers/media/common/tuners/tuner-xc2028.c
+++ b/drivers/media/common/tuners/tuner-xc2028.c
@@ -756,7 +756,7 @@ retry:
          * No need to reload base firmware if it matches and if the tuner
          * is not at sleep mode
          */
-        if ((priv->state = XC2028_ACTIVE) &&
+        if ((priv->state == XC2028_ACTIVE) &&
             (((BASE | new_fw.type) & BASE_TYPES) ==
             (priv->cur_fw.type & BASE_TYPES))) {
                 tuner_dbg("BASE firmware not changed.\n");
@@ -978,7 +978,7 @@ static int xc2028_get_afc(struct dvb_frontend *fe, s32 *afc)
         /* Get AFC */
         rc = xc2028_get_reg(priv, XREG_FREQ_ERROR, &afc_reg);
         if (rc < 0)
-                return rc;
+                goto ret;
 
         *afc = afc_reg * 15625; /* Hz */
 
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c
index bac8009e1d49..362a8d7c9738 100644
--- a/drivers/media/common/tuners/xc5000.c
+++ b/drivers/media/common/tuners/xc5000.c
@@ -210,13 +210,15 @@ struct xc5000_fw_cfg {
         u16 size;
 };
 
+#define XC5000A_FIRMWARE "dvb-fe-xc5000-1.6.114.fw"
 static const struct xc5000_fw_cfg xc5000a_1_6_114 = {
-        .name = "dvb-fe-xc5000-1.6.114.fw",
+        .name = XC5000A_FIRMWARE,
         .size = 12401,
 };
 
+#define XC5000C_FIRMWARE "dvb-fe-xc5000c-41.024.5.fw"
 static const struct xc5000_fw_cfg xc5000c_41_024_5 = {
-        .name = "dvb-fe-xc5000c-41.024.5.fw",
+        .name = XC5000C_FIRMWARE,
         .size = 16497,
 };
 
@@ -1259,3 +1261,5 @@ EXPORT_SYMBOL(xc5000_attach);
 MODULE_AUTHOR("Steven Toth");
 MODULE_DESCRIPTION("Xceive xc5000 silicon tuner driver");
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE(XC5000A_FIRMWARE);
+MODULE_FIRMWARE(XC5000C_FIRMWARE);
diff --git a/drivers/media/dvb/dvb-usb/az6007.c b/drivers/media/dvb/dvb-usb/az6007.c
index 8ffcad000ad3..86861e6f86d2 100644
--- a/drivers/media/dvb/dvb-usb/az6007.c
+++ b/drivers/media/dvb/dvb-usb/az6007.c
@@ -590,7 +590,7 @@ static int az6007_read_mac_addr(struct dvb_usb_device *d, u8 mac[6])
         int ret;
 
         ret = az6007_read(d, AZ6007_READ_DATA, 6, 0, st->data, 6);
-        memcpy(mac, st->data, sizeof(mac));
+        memcpy(mac, st->data, 6);
 
         if (ret > 0)
                 deb_info("%s: mac is %pM\n", __func__, mac);
diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/frontends/dib8000.c
index 9ca34f495009..1f3bcb5a1de8 100644
--- a/drivers/media/dvb/frontends/dib8000.c
+++ b/drivers/media/dvb/frontends/dib8000.c
@@ -2680,12 +2680,14 @@ static int dib8000_tune(struct dvb_frontend *fe)
 {
         struct dib8000_state *state = fe->demodulator_priv;
         int ret = 0;
-        u16 lock, value, mode = fft_to_mode(state);
+        u16 lock, value, mode;
 
         // we are already tuned - just resuming from suspend
         if (state == NULL)
                 return -EINVAL;
 
+        mode = fft_to_mode(state);
+
         dib8000_set_bandwidth(fe, state->fe[0]->dtv_property_cache.bandwidth_hz / 1000);
         dib8000_set_channel(state, 0, 0);
 
diff --git a/drivers/media/dvb/frontends/lgs8gxx.c b/drivers/media/dvb/frontends/lgs8gxx.c
index 568363a10a31..c2ea2749ebed 100644
--- a/drivers/media/dvb/frontends/lgs8gxx.c
+++ b/drivers/media/dvb/frontends/lgs8gxx.c
@@ -40,6 +40,8 @@
 static int debug;
 static int fake_signal_str = 1;
 
+#define LGS8GXX_FIRMWARE "lgs8g75.fw"
+
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
 
@@ -592,7 +594,7 @@ static int lgs8g75_init_data(struct lgs8gxx_state *priv)
         int rc;
         int i;
 
-        rc = request_firmware(&fw, "lgs8g75.fw", &priv->i2c->dev);
+        rc = request_firmware(&fw, LGS8GXX_FIRMWARE, &priv->i2c->dev);
         if (rc)
                 return rc;
 
@@ -1070,3 +1072,4 @@ EXPORT_SYMBOL(lgs8gxx_attach);
 MODULE_DESCRIPTION("Legend Silicon LGS8913/LGS8GXX DMB-TH demodulator driver");
 MODULE_AUTHOR("David T. L. Wong <davidtlwong@gmail.com>");
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE(LGS8GXX_FIRMWARE);
diff --git a/drivers/media/dvb/frontends/rtl2832.c b/drivers/media/dvb/frontends/rtl2832.c
index 2da592fb38ad..28269ccaeab7 100644
--- a/drivers/media/dvb/frontends/rtl2832.c
+++ b/drivers/media/dvb/frontends/rtl2832.c
@@ -589,7 +589,7 @@ static int rtl2832_set_frontend(struct dvb_frontend *fe)
                 return -EINVAL;
         }
 
-        for (j = 0; j < sizeof(bw_params[j]); j++) {
+        for (j = 0; j < sizeof(bw_params[0]); j++) {
                 ret = rtl2832_wr_regs(priv, 0x1c+j, 1, &bw_params[i][j], 1);
                 if (ret)
                         goto err;
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index 7331e8450d1a..9cc55546cc30 100644
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -276,16 +276,13 @@ static void smscore_notify_clients(struct smscore_device_t *coredev)
 static int smscore_notify_callbacks(struct smscore_device_t *coredev,
                                     struct device *device, int arrival)
 {
-        struct list_head *next, *first;
+        struct smscore_device_notifyee_t *elem;
         int rc = 0;
 
         /* note: must be called under g_deviceslock */
 
-        first = &g_smscore_notifyees;
-
-        for (next = first->next; next != first; next = next->next) {
-                rc = ((struct smscore_device_notifyee_t *) next)->
-                                hotplug(coredev, device, arrival);
+        list_for_each_entry(elem, &g_smscore_notifyees, entry) {
+                rc = elem->hotplug(coredev, device, arrival);
                 if (rc < 0)
                         break;
         }
@@ -940,29 +937,25 @@ static struct
 smscore_client_t *smscore_find_client(struct smscore_device_t *coredev,
                                       int data_type, int id)
 {
-        struct smscore_client_t *client = NULL;
-        struct list_head *next, *first;
+        struct list_head *first;
+        struct smscore_client_t *client;
         unsigned long flags;
-        struct list_head *firstid, *nextid;
-
+        struct list_head *firstid;
+        struct smscore_idlist_t *client_id;
 
         spin_lock_irqsave(&coredev->clientslock, flags);
         first = &coredev->clients;
-        for (next = first->next;
-             (next != first) && !client;
-             next = next->next) {
-                firstid = &((struct smscore_client_t *)next)->idlist;
-                for (nextid = firstid->next;
-                     nextid != firstid;
-                     nextid = nextid->next) {
-                        if ((((struct smscore_idlist_t *)nextid)->id == id) &&
-                            (((struct smscore_idlist_t *)nextid)->data_type == data_type ||
-                            (((struct smscore_idlist_t *)nextid)->data_type == 0))) {
-                                client = (struct smscore_client_t *) next;
-                                break;
-                        }
+        list_for_each_entry(client, first, entry) {
+                firstid = &client->idlist;
+                list_for_each_entry(client_id, firstid, entry) {
+                        if ((client_id->id == id) &&
+                            (client_id->data_type == data_type ||
+                            (client_id->data_type == 0)))
+                                goto found;
                 }
         }
+        client = NULL;
+found:
         spin_unlock_irqrestore(&coredev->clientslock, flags);
         return client;
 }
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 24ce5a47f955..8090b87b3066 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -57,6 +57,39 @@ config RADIO_MAXIRADIO
           To compile this driver as a module, choose M here: the
           module will be called radio-maxiradio.
 
+config RADIO_SHARK
+        tristate "Griffin radioSHARK USB radio receiver"
+        depends on USB && SND
+        ---help---
+          Choose Y here if you have this radio receiver.
+
+          There are 2 versions of this device, this driver is for version 1,
+          which is white.
+
+          In order to control your radio card, you will need to use programs
+          that are compatible with the Video For Linux API.  Information on
+          this API and pointers to "v4l" programs may be found at
+          <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called radio-shark.
+
+config RADIO_SHARK2
+        tristate "Griffin radioSHARK2 USB radio receiver"
+        depends on USB
+        ---help---
+          Choose Y here if you have this radio receiver.
+
+          There are 2 versions of this device, this driver is for version 2,
+          which is black.
+
+          In order to control your radio card, you will need to use programs
+          that are compatible with the Video For Linux API.  Information on
+          this API and pointers to "v4l" programs may be found at
+          <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called radio-shark2.
 
 config I2C_SI4713
         tristate "I2C driver for Silicon Labs Si4713 device"
diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile
index ca8c7d134b95..c03ce4fe74e9 100644
--- a/drivers/media/radio/Makefile
+++ b/drivers/media/radio/Makefile
@@ -11,6 +11,8 @@ obj-$(CONFIG_RADIO_CADET) += radio-cadet.o
 obj-$(CONFIG_RADIO_TYPHOON) += radio-typhoon.o
 obj-$(CONFIG_RADIO_TERRATEC) += radio-terratec.o
 obj-$(CONFIG_RADIO_MAXIRADIO) += radio-maxiradio.o
+obj-$(CONFIG_RADIO_SHARK) += radio-shark.o
+obj-$(CONFIG_RADIO_SHARK2) += shark2.o
 obj-$(CONFIG_RADIO_RTRACK) += radio-aimslab.o
 obj-$(CONFIG_RADIO_ZOLTRIX) += radio-zoltrix.o
 obj-$(CONFIG_RADIO_GEMTEK) += radio-gemtek.o
@@ -29,4 +31,6 @@ obj-$(CONFIG_RADIO_TIMBERDALE) += radio-timb.o
 obj-$(CONFIG_RADIO_WL1273) += radio-wl1273.o
 obj-$(CONFIG_RADIO_WL128X) += wl128x/
 
+shark2-objs := radio-shark2.o radio-tea5777.o
+
 ccflags-y += -Isound
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 16a089fad909..697a421c9940 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -41,6 +41,9 @@
 #include <linux/io.h>           /* outb, outb_p                 */
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-fh.h>
+#include <media/v4l2-event.h>
 
 MODULE_AUTHOR("Fred Gleason, Russell Kroll, Quay Lu, Donald Song, Jason Lewis, Scott McGrath, William McGrath");
 MODULE_DESCRIPTION("A driver for the ADS Cadet AM/FM/RDS radio card.");
@@ -61,14 +64,15 @@ module_param(radio_nr, int, 0);
 struct cadet {
         struct v4l2_device v4l2_dev;
         struct video_device vdev;
+        struct v4l2_ctrl_handler ctrl_handler;
         int io;
-        int users;
-        int curtuner;
+        bool is_fm_band;
+        u32 curfreq;
         int tunestat;
         int sigstrength;
         wait_queue_head_t read_queue;
         struct timer_list readtimer;
-        __u8 rdsin, rdsout, rdsstat;
+        u8 rdsin, rdsout, rdsstat;
         unsigned char rdsbuf[RDS_BUFFER];
         struct mutex lock;
         int reading;
@@ -81,9 +85,9 @@ static struct cadet cadet_card;
  * The V4L API spec does not define any particular unit for the signal
  * strength value.  These values are in microvolts of RF at the tuner's input.
  */
-static __u16 sigtable[2][4] = {
-        {  5, 10, 30,  150 },
-        { 28, 40, 63, 1000 }
+static u16 sigtable[2][4] = {
+        { 1835, 2621,  4128, 65535 },
+        { 2185, 4369, 13107, 65535 },
 };
 
 
@@ -91,14 +95,12 @@ static int cadet_getstereo(struct cadet *dev)
 {
         int ret = V4L2_TUNER_SUB_MONO;
 
-        if (dev->curtuner != 0) /* Only FM has stereo capability! */
+        if (!dev->is_fm_band)   /* Only FM has stereo capability! */
                 return V4L2_TUNER_SUB_MONO;
 
-        mutex_lock(&dev->lock);
         outb(7, dev->io);          /* Select tuner control */
         if ((inb(dev->io + 1) & 0x40) == 0)
                 ret = V4L2_TUNER_SUB_STEREO;
-        mutex_unlock(&dev->lock);
         return ret;
 }
 
@@ -111,8 +113,6 @@ static unsigned cadet_gettune(struct cadet *dev)
          * Prepare for read
          */
 
-        mutex_lock(&dev->lock);
-
         outb(7, dev->io);       /* Select tuner control */
         curvol = inb(dev->io + 1); /* Save current volume/mute setting */
         outb(0x00, dev->io + 1);  /* Ensure WRITE-ENABLE is LOW */
@@ -134,8 +134,6 @@ static unsigned cadet_gettune(struct cadet *dev)
          * Restore volume/mute setting
          */
         outb(curvol, dev->io + 1);
-        mutex_unlock(&dev->lock);
-
         return fifo;
 }
 
@@ -152,20 +150,18 @@ static unsigned cadet_getfreq(struct cadet *dev)
         /*
          * Convert to actual frequency
          */
-        if (dev->curtuner == 0) {    /* FM */
-                test = 12500;
-                for (i = 0; i < 14; i++) {
-                        if ((fifo & 0x01) != 0)
-                                freq += test;
-                        test = test << 1;
-                        fifo = fifo >> 1;
-                }
-                freq -= 10700000;           /* IF frequency is 10.7 MHz */
-                freq = (freq * 16) / 1000000;   /* Make it 1/16 MHz */
+        if (!dev->is_fm_band)    /* AM */
+                return ((fifo & 0x7fff) - 450) * 16;
+
+        test = 12500;
+        for (i = 0; i < 14; i++) {
+                if ((fifo & 0x01) != 0)
+                        freq += test;
+                test = test << 1;
+                fifo = fifo >> 1;
         }
-        if (dev->curtuner == 1)    /* AM */
-                freq = ((fifo & 0x7fff) - 2010) * 16;
-
+        freq -= 10700000;           /* IF frequency is 10.7 MHz */
+        freq = (freq * 16) / 1000;   /* Make it 1/16 kHz */
         return freq;
 }
 
@@ -174,8 +170,6 @@ static void cadet_settune(struct cadet *dev, unsigned fifo)
         int i;
         unsigned test;
 
-        mutex_lock(&dev->lock);
-
         outb(7, dev->io);                /* Select tuner control */
         /*
          * Write the shift register
@@ -194,7 +188,6 @@ static void cadet_settune(struct cadet *dev, unsigned fifo)
                 test = 0x1c | ((fifo >> 23) & 0x02);
                 outb(test, dev->io + 1);
         }
-        mutex_unlock(&dev->lock);
 }
 
 static void cadet_setfreq(struct cadet *dev, unsigned freq)
@@ -203,13 +196,14 @@ static void cadet_setfreq(struct cadet *dev, unsigned freq)
         int i, j, test;
         int curvol;
 
+        dev->curfreq = freq;
         /*
          * Formulate a fifo command
          */
         fifo = 0;
-        if (dev->curtuner == 0) {    /* FM */
+        if (dev->is_fm_band) {    /* FM */
                 test = 102400;
-                freq = (freq * 1000) / 16;       /* Make it kHz */
+                freq = freq / 16;       /* Make it kHz */
                 freq += 10700;               /* IF is 10700 kHz */
                 for (i = 0; i < 14; i++) {
                         fifo = fifo << 1;
@@ -219,20 +213,17 @@ static void cadet_setfreq(struct cadet *dev, unsigned freq)
                         }
                         test = test >> 1;
                 }
-        }
-        if (dev->curtuner == 1) {    /* AM */
-                fifo = (freq / 16) + 2010;            /* Make it kHz */
-                fifo |= 0x100000;            /* Select AM Band */
+        } else {        /* AM */
+                fifo = (freq / 16) + 450;       /* Make it kHz */
+                fifo |= 0x100000;               /* Select AM Band */
         }
 
         /*
          * Save current volume/mute setting
          */
 
-        mutex_lock(&dev->lock);
         outb(7, dev->io);                /* Select tuner control */
         curvol = inb(dev->io + 1);
-        mutex_unlock(&dev->lock);
 
         /*
          * Tune the card
@@ -240,49 +231,24 @@ static void cadet_setfreq(struct cadet *dev, unsigned freq)
         for (j = 3; j > -1; j--) {
                 cadet_settune(dev, fifo | (j << 16));
 
-                mutex_lock(&dev->lock);
                 outb(7, dev->io);         /* Select tuner control */
                 outb(curvol, dev->io + 1);
-                mutex_unlock(&dev->lock);
 
                 msleep(100);
 
                 cadet_gettune(dev);
                 if ((dev->tunestat & 0x40) == 0) {   /* Tuned */
-                        dev->sigstrength = sigtable[dev->curtuner][j];
-                        return;
+                        dev->sigstrength = sigtable[dev->is_fm_band][j];
+                        goto reset_rds;
                 }
         }
         dev->sigstrength = 0;
+reset_rds:
+        outb(3, dev->io);
+        outb(inb(dev->io + 1) & 0x7f, dev->io + 1);
 }
 
 
-static int cadet_getvol(struct cadet *dev)
-{
-        int ret = 0;
-
-        mutex_lock(&dev->lock);
-
-        outb(7, dev->io);                /* Select tuner control */
-        if ((inb(dev->io + 1) & 0x20) != 0)
-                ret = 0xffff;
-
-        mutex_unlock(&dev->lock);
-        return ret;
-}
-
-
-static void cadet_setvol(struct cadet *dev, int vol)
-{
-        mutex_lock(&dev->lock);
-        outb(7, dev->io);                /* Select tuner control */
-        if (vol > 0)
-                outb(0x20, dev->io + 1);
-        else
-                outb(0x00, dev->io + 1);
-        mutex_unlock(&dev->lock);
-}
-
 static void cadet_handler(unsigned long data)
 {
         struct cadet *dev = (void *)data;
@@ -295,7 +261,7 @@ static void cadet_handler(unsigned long data)
                 outb(0x80, dev->io);      /* Select RDS fifo */
                 while ((inb(dev->io) & 0x80) != 0) {
                         dev->rdsbuf[dev->rdsin] = inb(dev->io + 1);
-                        if (dev->rdsin == dev->rdsout)
+                        if (dev->rdsin + 1 == dev->rdsout)
                                 printk(KERN_WARNING "cadet: RDS buffer overflow\n");
                         else
                                 dev->rdsin++;
@@ -314,11 +280,21 @@ static void cadet_handler(unsigned long data)
          */
         init_timer(&dev->readtimer);
         dev->readtimer.function = cadet_handler;
-        dev->readtimer.data = (unsigned long)0;
+        dev->readtimer.data = data;
         dev->readtimer.expires = jiffies + msecs_to_jiffies(50);
         add_timer(&dev->readtimer);
 }
 
+static void cadet_start_rds(struct cadet *dev)
+{
+        dev->rdsstat = 1;
+        outb(0x80, dev->io);        /* Select RDS fifo */
+        init_timer(&dev->readtimer);
+        dev->readtimer.function = cadet_handler;
+        dev->readtimer.data = (unsigned long)dev;
+        dev->readtimer.expires = jiffies + msecs_to_jiffies(50);
+        add_timer(&dev->readtimer);
+}
 
 static ssize_t cadet_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
 {
@@ -327,28 +303,24 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
         int i = 0;
 
         mutex_lock(&dev->lock);
-        if (dev->rdsstat == 0) {
-                dev->rdsstat = 1;
-                outb(0x80, dev->io);        /* Select RDS fifo */
-                init_timer(&dev->readtimer);
-                dev->readtimer.function = cadet_handler;
-                dev->readtimer.data = (unsigned long)dev;
-                dev->readtimer.expires = jiffies + msecs_to_jiffies(50);
-                add_timer(&dev->readtimer);
-        }
+        if (dev->rdsstat == 0)
+                cadet_start_rds(dev);
         if (dev->rdsin == dev->rdsout) {
+                if (file->f_flags & O_NONBLOCK) {
+                        i = -EWOULDBLOCK;
+                        goto unlock;
+                }
                 mutex_unlock(&dev->lock);
-                if (file->f_flags & O_NONBLOCK)
-                        return -EWOULDBLOCK;
                 interruptible_sleep_on(&dev->read_queue);
                 mutex_lock(&dev->lock);
         }
         while (i < count && dev->rdsin != dev->rdsout)
                 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
-        mutex_unlock(&dev->lock);
 
-        if (copy_to_user(data, readbuf, i))
-                return -EFAULT;
+        if (i && copy_to_user(data, readbuf, i))
+                i = -EFAULT;
+unlock:
+        mutex_unlock(&dev->lock);
         return i;
 }
 
@@ -359,48 +331,58 @@ static int vidioc_querycap(struct file *file, void *priv,
         strlcpy(v->driver, "ADS Cadet", sizeof(v->driver));
         strlcpy(v->card, "ADS Cadet", sizeof(v->card));
         strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
-        v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO |
+        v->device_caps = V4L2_CAP_TUNER | V4L2_CAP_RADIO |
                           V4L2_CAP_READWRITE | V4L2_CAP_RDS_CAPTURE;
+        v->capabilities = v->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
+static const struct v4l2_frequency_band bands[] = {
+        {
+                .index = 0,
+                .type = V4L2_TUNER_RADIO,
+                .capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_FREQ_BANDS,
+                .rangelow = 8320,      /* 520 kHz */
+                .rangehigh = 26400,    /* 1650 kHz */
+                .modulation = V4L2_BAND_MODULATION_AM,
+        }, {
+                .index = 1,
+                .type = V4L2_TUNER_RADIO,
+                .capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS |
+                        V4L2_TUNER_CAP_RDS_BLOCK_IO | V4L2_TUNER_CAP_LOW |
+                        V4L2_TUNER_CAP_FREQ_BANDS,
+                .rangelow = 1400000,   /* 87.5 MHz */
+                .rangehigh = 1728000,  /* 108.0 MHz */
+                .modulation = V4L2_BAND_MODULATION_FM,
+        },
+};
+
 static int vidioc_g_tuner(struct file *file, void *priv,
                                 struct v4l2_tuner *v)
 {
         struct cadet *dev = video_drvdata(file);
 
+        if (v->index)
+                return -EINVAL;
         v->type = V4L2_TUNER_RADIO;
-        switch (v->index) {
-        case 0:
-                strlcpy(v->name, "FM", sizeof(v->name));
-                v->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS |
-                        V4L2_TUNER_CAP_RDS_BLOCK_IO;
-                v->rangelow = 1400;     /* 87.5 MHz */
-                v->rangehigh = 1728;    /* 108.0 MHz */
+        strlcpy(v->name, "Radio", sizeof(v->name));
+        v->capability = bands[0].capability | bands[1].capability;
+        v->rangelow = bands[0].rangelow;           /* 520 kHz (start of AM band) */
+        v->rangehigh = bands[1].rangehigh;    /* 108.0 MHz (end of FM band) */
+        if (dev->is_fm_band) {
                 v->rxsubchans = cadet_getstereo(dev);
-                switch (v->rxsubchans) {
-                case V4L2_TUNER_SUB_MONO:
-                        v->audmode = V4L2_TUNER_MODE_MONO;
-                        break;
-                case V4L2_TUNER_SUB_STEREO:
-                        v->audmode = V4L2_TUNER_MODE_STEREO;
-                        break;
-                default:
-                        break;
-                }
-                v->rxsubchans |= V4L2_TUNER_SUB_RDS;
-                break;
-        case 1:
-                strlcpy(v->name, "AM", sizeof(v->name));
-                v->capability = V4L2_TUNER_CAP_LOW;
+                outb(3, dev->io);
+                outb(inb(dev->io + 1) & 0x7f, dev->io + 1);
+                mdelay(100);
+                outb(3, dev->io);
+                if (inb(dev->io + 1) & 0x80)
+                        v->rxsubchans |= V4L2_TUNER_SUB_RDS;
+        } else {
                 v->rangelow = 8320;      /* 520 kHz */
                 v->rangehigh = 26400;    /* 1650 kHz */
                 v->rxsubchans = V4L2_TUNER_SUB_MONO;
-                v->audmode = V4L2_TUNER_MODE_MONO;
-                break;
-        default:
-                return -EINVAL;
         }
+        v->audmode = V4L2_TUNER_MODE_STEREO;
         v->signal = dev->sigstrength; /* We might need to modify scaling of this */
         return 0;
 }
@@ -408,11 +390,17 @@ static int vidioc_g_tuner(struct file *file, void *priv,
 static int vidioc_s_tuner(struct file *file, void *priv,
                                 struct v4l2_tuner *v)
 {
-        struct cadet *dev = video_drvdata(file);
+        return v->index ? -EINVAL : 0;
+}
 
-        if (v->index != 0 && v->index != 1)
+static int vidioc_enum_freq_bands(struct file *file, void *priv,
+                                struct v4l2_frequency_band *band)
+{
+        if (band->tuner)
+                return -EINVAL;
+        if (band->index >= ARRAY_SIZE(bands))
                 return -EINVAL;
-        dev->curtuner = v->index;
+        *band = bands[band->index];
         return 0;
 }
 
@@ -421,9 +409,10 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct cadet *dev = video_drvdata(file);
 
-        f->tuner = dev->curtuner;
+        if (f->tuner)
+                return -EINVAL;
         f->type = V4L2_TUNER_RADIO;
-        f->frequency = cadet_getfreq(dev);
+        f->frequency = dev->curfreq;
         return 0;
 }
 
@@ -433,103 +422,46 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct cadet *dev = video_drvdata(file);
 
-        if (f->type != V4L2_TUNER_RADIO)
-                return -EINVAL;
-        if (dev->curtuner == 0 && (f->frequency < 1400 || f->frequency > 1728))
-                return -EINVAL;
-        if (dev->curtuner == 1 && (f->frequency < 8320 || f->frequency > 26400))
+        if (f->tuner)
                 return -EINVAL;
+        dev->is_fm_band =
+                f->frequency >= (bands[0].rangehigh + bands[1].rangelow) / 2;
+        clamp(f->frequency, bands[dev->is_fm_band].rangelow,
+                            bands[dev->is_fm_band].rangehigh);
         cadet_setfreq(dev, f->frequency);
         return 0;
 }
 
-static int vidioc_queryctrl(struct file *file, void *priv,
-                                struct v4l2_queryctrl *qc)
+static int cadet_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        switch (qc->id) {
-        case V4L2_CID_AUDIO_MUTE:
-                return v4l2_ctrl_query_fill(qc, 0, 1, 1, 1);
-        case V4L2_CID_AUDIO_VOLUME:
-                return v4l2_ctrl_query_fill(qc, 0, 0xff, 1, 0xff);
-        }
-        return -EINVAL;
-}
-
-static int vidioc_g_ctrl(struct file *file, void *priv,
-                                struct v4l2_control *ctrl)
-{
-        struct cadet *dev = video_drvdata(file);
+        struct cadet *dev = container_of(ctrl->handler, struct cadet, ctrl_handler);
 
         switch (ctrl->id) {
-        case V4L2_CID_AUDIO_MUTE: /* TODO: Handle this correctly */
-                ctrl->value = (cadet_getvol(dev) == 0);
-                break;
-        case V4L2_CID_AUDIO_VOLUME:
-                ctrl->value = cadet_getvol(dev);
-                break;
-        default:
-                return -EINVAL;
-        }
-        return 0;
-}
-
-static int vidioc_s_ctrl(struct file *file, void *priv,
-                                struct v4l2_control *ctrl)
-{
-        struct cadet *dev = video_drvdata(file);
-
-        switch (ctrl->id){
-        case V4L2_CID_AUDIO_MUTE: /* TODO: Handle this correctly */
-                if (ctrl->value)
-                        cadet_setvol(dev, 0);
+        case V4L2_CID_AUDIO_MUTE:
+                outb(7, dev->io);                /* Select tuner control */
+                if (ctrl->val)
+                        outb(0x00, dev->io + 1);
                 else
-                        cadet_setvol(dev, 0xffff);
-                break;
-        case V4L2_CID_AUDIO_VOLUME:
-                cadet_setvol(dev, ctrl->value);
-                break;
-        default:
-                return -EINVAL;
+                        outb(0x20, dev->io + 1);
+                return 0;
         }
-        return 0;
-}
-
-static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)
-{
-        *i = 0;
-        return 0;
-}
-
-static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)
-{
-        return i ? -EINVAL : 0;
-}
-
-static int vidioc_g_audio(struct file *file, void *priv,
-                                struct v4l2_audio *a)
-{
-        a->index = 0;
-        strlcpy(a->name, "Radio", sizeof(a->name));
-        a->capability = V4L2_AUDCAP_STEREO;
-        return 0;
-}
-
-static int vidioc_s_audio(struct file *file, void *priv,
-                                struct v4l2_audio *a)
-{
-        return a->index ? -EINVAL : 0;
+        return -EINVAL;
 }
 
 static int cadet_open(struct file *file)
 {
         struct cadet *dev = video_drvdata(file);
+        int err;
 
         mutex_lock(&dev->lock);
-        dev->users++;
-        if (1 == dev->users)
+        err = v4l2_fh_open(file);
+        if (err)
+                goto fail;
+        if (v4l2_fh_is_singular_file(file))
                 init_waitqueue_head(&dev->read_queue);
+fail:
         mutex_unlock(&dev->lock);
-        return 0;
+        return err;
 }
 
 static int cadet_release(struct file *file)
@@ -537,11 +469,11 @@ static int cadet_release(struct file *file)
         struct cadet *dev = video_drvdata(file);
 
         mutex_lock(&dev->lock);
-        dev->users--;
-        if (0 == dev->users) {
+        if (v4l2_fh_is_singular_file(file) && dev->rdsstat) {
                 del_timer_sync(&dev->readtimer);
                 dev->rdsstat = 0;
         }
+        v4l2_fh_release(file);
         mutex_unlock(&dev->lock);
         return 0;
 }
@@ -549,11 +481,19 @@ static int cadet_release(struct file *file)
 static unsigned int cadet_poll(struct file *file, struct poll_table_struct *wait)
 {
         struct cadet *dev = video_drvdata(file);
+        unsigned long req_events = poll_requested_events(wait);
+        unsigned int res = v4l2_ctrl_poll(file, wait);
 
         poll_wait(file, &dev->read_queue, wait);
+        if (dev->rdsstat == 0 && (req_events & (POLLIN | POLLRDNORM))) {
+                mutex_lock(&dev->lock);
+                if (dev->rdsstat == 0)
+                        cadet_start_rds(dev);
+                mutex_unlock(&dev->lock);
+        }
         if (dev->rdsin != dev->rdsout)
-                return POLLIN | POLLRDNORM;
-        return 0;
+                res |= POLLIN | POLLRDNORM;
+        return res;
 }
 
 
@@ -572,13 +512,14 @@ static const struct v4l2_ioctl_ops cadet_ioctl_ops = {
         .vidioc_s_tuner     = vidioc_s_tuner,
         .vidioc_g_frequency = vidioc_g_frequency,
         .vidioc_s_frequency = vidioc_s_frequency,
-        .vidioc_queryctrl   = vidioc_queryctrl,
-        .vidioc_g_ctrl      = vidioc_g_ctrl,
-        .vidioc_s_ctrl      = vidioc_s_ctrl,
-        .vidioc_g_audio     = vidioc_g_audio,
-        .vidioc_s_audio     = vidioc_s_audio,
-        .vidioc_g_input     = vidioc_g_input,
-        .vidioc_s_input     = vidioc_s_input,
+        .vidioc_enum_freq_bands = vidioc_enum_freq_bands,
+        .vidioc_log_status  = v4l2_ctrl_log_status,
+        .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
+        .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
+};
+
+static const struct v4l2_ctrl_ops cadet_ctrl_ops = {
+        .s_ctrl = cadet_s_ctrl,
 };
 
 #ifdef CONFIG_PNP
@@ -628,8 +569,8 @@ static void cadet_probe(struct cadet *dev)
         for (i = 0; i < 8; i++) {
                 dev->io = iovals[i];
                 if (request_region(dev->io, 2, "cadet-probe")) {
-                        cadet_setfreq(dev, 1410);
-                        if (cadet_getfreq(dev) == 1410) {
+                        cadet_setfreq(dev, bands[1].rangelow);
+                        if (cadet_getfreq(dev) == bands[1].rangelow) {
                                 release_region(dev->io, 2);
                                 return;
                         }
@@ -648,7 +589,8 @@ static int __init cadet_init(void)
 {
         struct cadet *dev = &cadet_card;
         struct v4l2_device *v4l2_dev = &dev->v4l2_dev;
-        int res;
+        struct v4l2_ctrl_handler *hdl;
+        int res = -ENODEV;
 
         strlcpy(v4l2_dev->name, "cadet", sizeof(v4l2_dev->name));
         mutex_init(&dev->lock);
@@ -680,23 +622,40 @@ static int __init cadet_init(void)
                 goto fail;
         }
 
+        hdl = &dev->ctrl_handler;
+        v4l2_ctrl_handler_init(hdl, 2);
+        v4l2_ctrl_new_std(hdl, &cadet_ctrl_ops,
+                        V4L2_CID_AUDIO_MUTE, 0, 1, 1, 1);
+        v4l2_dev->ctrl_handler = hdl;
+        if (hdl->error) {
+                res = hdl->error;
+                v4l2_err(v4l2_dev, "Could not register controls\n");
+                goto err_hdl;
+        }
+
+        dev->is_fm_band = true;
+        dev->curfreq = bands[dev->is_fm_band].rangelow;
+        cadet_setfreq(dev, dev->curfreq);
         strlcpy(dev->vdev.name, v4l2_dev->name, sizeof(dev->vdev.name));
         dev->vdev.v4l2_dev = v4l2_dev;
         dev->vdev.fops = &cadet_fops;
         dev->vdev.ioctl_ops = &cadet_ioctl_ops;
         dev->vdev.release = video_device_release_empty;
+        dev->vdev.lock = &dev->lock;
+        set_bit(V4L2_FL_USE_FH_PRIO, &dev->vdev.flags);
         video_set_drvdata(&dev->vdev, dev);
 
-        if (video_register_device(&dev->vdev, VFL_TYPE_RADIO, radio_nr) < 0) {
-                v4l2_device_unregister(v4l2_dev);
-                release_region(dev->io, 2);
-                goto fail;
-        }
+        if (video_register_device(&dev->vdev, VFL_TYPE_RADIO, radio_nr) < 0)
+                goto err_hdl;
         v4l2_info(v4l2_dev, "ADS Cadet Radio Card at 0x%x\n", dev->io);
         return 0;
+err_hdl:
+        v4l2_ctrl_handler_free(hdl);
+        v4l2_device_unregister(v4l2_dev);
+        release_region(dev->io, 2);
 fail:
         pnp_unregister_driver(&cadet_pnp_driver);
-        return -ENODEV;
+        return res;
 }
 
 static void __exit cadet_exit(void)
@@ -704,7 +663,10 @@ static void __exit cadet_exit(void)
         struct cadet *dev = &cadet_card;
 
         video_unregister_device(&dev->vdev);
+        v4l2_ctrl_handler_free(&dev->ctrl_handler);
         v4l2_device_unregister(&dev->v4l2_dev);
+        outb(7, dev->io);       /* Mute */
+        outb(0x00, dev->io + 1);
         release_region(dev->io, 2);
         pnp_unregister_driver(&cadet_pnp_driver);
 }
diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
new file mode 100644
index 000000000000..d0b6bb507634
--- /dev/null
+++ b/drivers/media/radio/radio-shark.c
@@ -0,0 +1,376 @@
+/*
+ * Linux V4L2 radio driver for the Griffin radioSHARK USB radio receiver
+ *
+ * Note the radioSHARK offers the audio through a regular USB audio device,
+ * this driver only handles the tuning.
+ *
+ * The info necessary to drive the shark was taken from the small userspace
+ * shark.c program by Michael Rolig, which he kindly placed in the Public
+ * Domain.
+ *
+ * Copyright (c) 2012 Hans de Goede <hdegoede@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/leds.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/usb.h>
+#include <linux/workqueue.h>
+#include <media/v4l2-device.h>
+#include <sound/tea575x-tuner.h>
+
+/*
+ * Version Information
+ */
+MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
+MODULE_DESCRIPTION("Griffin radioSHARK, USB radio receiver driver");
+MODULE_LICENSE("GPL");
+
+#define SHARK_IN_EP             0x83
+#define SHARK_OUT_EP            0x05
+
+#define TEA575X_BIT_MONO        (1<<22)         /* 0 = stereo, 1 = mono */
+#define TEA575X_BIT_BAND_MASK   (3<<20)
+#define TEA575X_BIT_BAND_FM     (0<<20)
+
+#define TB_LEN 6
+#define DRV_NAME "radioshark"
+
+#define v4l2_dev_to_shark(d) container_of(d, struct shark_device, v4l2_dev)
+
+enum { BLUE_LED, BLUE_PULSE_LED, RED_LED, NO_LEDS };
+
+static void shark_led_set_blue(struct led_classdev *led_cdev,
+                               enum led_brightness value);
+static void shark_led_set_blue_pulse(struct led_classdev *led_cdev,
+                                     enum led_brightness value);
+static void shark_led_set_red(struct led_classdev *led_cdev,
+                              enum led_brightness value);
+
+static const struct led_classdev shark_led_templates[NO_LEDS] = {
+        [BLUE_LED] = {
+                .name           = "%s:blue:",
+                .brightness     = LED_OFF,
+                .max_brightness = 127,
+                .brightness_set = shark_led_set_blue,
+        },
+        [BLUE_PULSE_LED] = {
+                .name           = "%s:blue-pulse:",
+                .brightness     = LED_OFF,
+                .max_brightness = 255,
+                .brightness_set = shark_led_set_blue_pulse,
+        },
+        [RED_LED] = {
+                .name           = "%s:red:",
+                .brightness     = LED_OFF,
+                .max_brightness = 1,
+                .brightness_set = shark_led_set_red,
+        },
+};
+
+struct shark_device {
+        struct usb_device *usbdev;
+        struct v4l2_device v4l2_dev;
+        struct snd_tea575x tea;
+
+        struct work_struct led_work;
+        struct led_classdev leds[NO_LEDS];
+        char led_names[NO_LEDS][32];
+        atomic_t brightness[NO_LEDS];
+        unsigned long brightness_new;
+
+        u8 *transfer_buffer;
+        u32 last_val;
+};
+
+static atomic_t shark_instance = ATOMIC_INIT(0);
+
+static void shark_write_val(struct snd_tea575x *tea, u32 val)
+{
+        struct shark_device *shark = tea->private_data;
+        int i, res, actual_len;
+
+        /* Avoid unnecessary (slow) USB transfers */
+        if (shark->last_val == val)
+                return;
+
+        memset(shark->transfer_buffer, 0, TB_LEN);
+        shark->transfer_buffer[0] = 0xc0; /* Write shift register command */
+        for (i = 0; i < 4; i++)
+                shark->transfer_buffer[i] |= (val >> (24 - i * 8)) & 0xff;
+
+        res = usb_interrupt_msg(shark->usbdev,
+                                usb_sndintpipe(shark->usbdev, SHARK_OUT_EP),
+                                shark->transfer_buffer, TB_LEN,
+                                &actual_len, 1000);
+        if (res >= 0)
+                shark->last_val = val;
+        else
+                v4l2_err(&shark->v4l2_dev, "set-freq error: %d\n", res);
+}
+
+static u32 shark_read_val(struct snd_tea575x *tea)
+{
+        struct shark_device *shark = tea->private_data;
+        int i, res, actual_len;
+        u32 val = 0;
+
+        memset(shark->transfer_buffer, 0, TB_LEN);
+        shark->transfer_buffer[0] = 0x80;
+        res = usb_interrupt_msg(shark->usbdev,
+                                usb_sndintpipe(shark->usbdev, SHARK_OUT_EP),
+                                shark->transfer_buffer, TB_LEN,
+                                &actual_len, 1000);
+        if (res < 0) {
+                v4l2_err(&shark->v4l2_dev, "request-status error: %d\n", res);
+                return shark->last_val;
+        }
+
+        res = usb_interrupt_msg(shark->usbdev,
+                                usb_rcvintpipe(shark->usbdev, SHARK_IN_EP),
+                                shark->transfer_buffer, TB_LEN,
+                                &actual_len, 1000);
+        if (res < 0) {
+                v4l2_err(&shark->v4l2_dev, "get-status error: %d\n", res);
+                return shark->last_val;
+        }
+
+        for (i = 0; i < 4; i++)
+                val |= shark->transfer_buffer[i] << (24 - i * 8);
+
+        shark->last_val = val;
+
+        /*
+         * The shark does not allow actually reading the stereo / mono pin :(
+         * So assume that when we're tuned to an FM station and mono has not
+         * been requested, that we're receiving stereo.
+         */
+        if (((val & TEA575X_BIT_BAND_MASK) == TEA575X_BIT_BAND_FM) &&
+            !(val & TEA575X_BIT_MONO))
+                shark->tea.stereo = true;
+        else
+                shark->tea.stereo = false;
+
+        return val;
+}
+
+static struct snd_tea575x_ops shark_tea_ops = {
+        .write_val = shark_write_val,
+        .read_val  = shark_read_val,
+};
+
+static void shark_led_work(struct work_struct *work)
+{
+        struct shark_device *shark =
+                container_of(work, struct shark_device, led_work);
+        int i, res, brightness, actual_len;
+
+        /*
+         * We use the v4l2_dev lock and registered bit to ensure the device
+         * does not get unplugged and unreffed while we're running.
+         */
+        mutex_lock(&shark->tea.mutex);
+        if (!video_is_registered(&shark->tea.vd))
+                goto leave;
+
+        for (i = 0; i < 3; i++) {
+                if (!test_and_clear_bit(i, &shark->brightness_new))
+                        continue;
+
+                brightness = atomic_read(&shark->brightness[i]);
+                memset(shark->transfer_buffer, 0, TB_LEN);
+                if (i != RED_LED) {
+                        shark->transfer_buffer[0] = 0xA0 + i;
+                        shark->transfer_buffer[1] = brightness;
+                } else
+                        shark->transfer_buffer[0] = brightness ? 0xA9 : 0xA8;
+                res = usb_interrupt_msg(shark->usbdev,
+                                        usb_sndintpipe(shark->usbdev, 0x05),
+                                        shark->transfer_buffer, TB_LEN,
+                                        &actual_len, 1000);
+                if (res < 0)
+                        v4l2_err(&shark->v4l2_dev, "set LED %s error: %d\n",
+                                 shark->led_names[i], res);
+        }
+leave:
+        mutex_unlock(&shark->tea.mutex);
+}
+
+static void shark_led_set_blue(struct led_classdev *led_cdev,
+                               enum led_brightness value)
+{
+        struct shark_device *shark =
+                container_of(led_cdev, struct shark_device, leds[BLUE_LED]);
+
+        atomic_set(&shark->brightness[BLUE_LED], value);
+        set_bit(BLUE_LED, &shark->brightness_new);
+        schedule_work(&shark->led_work);
+}
+
+static void shark_led_set_blue_pulse(struct led_classdev *led_cdev,
+                                     enum led_brightness value)
+{
+        struct shark_device *shark = container_of(led_cdev,
+                                struct shark_device, leds[BLUE_PULSE_LED]);
+
+        atomic_set(&shark->brightness[BLUE_PULSE_LED], 256 - value);
+        set_bit(BLUE_PULSE_LED, &shark->brightness_new);
+        schedule_work(&shark->led_work);
+}
+
+static void shark_led_set_red(struct led_classdev *led_cdev,
+                              enum led_brightness value)
+{
+        struct shark_device *shark =
+                container_of(led_cdev, struct shark_device, leds[RED_LED]);
+
+        atomic_set(&shark->brightness[RED_LED], value);
+        set_bit(RED_LED, &shark->brightness_new);
+        schedule_work(&shark->led_work);
+}
+
+static void usb_shark_disconnect(struct usb_interface *intf)
+{
+        struct v4l2_device *v4l2_dev = usb_get_intfdata(intf);
+        struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);
+        int i;
+
+        mutex_lock(&shark->tea.mutex);
+        v4l2_device_disconnect(&shark->v4l2_dev);
+        snd_tea575x_exit(&shark->tea);
+        mutex_unlock(&shark->tea.mutex);
+
+        for (i = 0; i < NO_LEDS; i++)
+                led_classdev_unregister(&shark->leds[i]);
+
+        v4l2_device_put(&shark->v4l2_dev);
+}
+
+static void usb_shark_release(struct v4l2_device *v4l2_dev)
+{
+        struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);
+
+        cancel_work_sync(&shark->led_work);
+        v4l2_device_unregister(&shark->v4l2_dev);
+        kfree(shark->transfer_buffer);
+        kfree(shark);
+}
+
+static int usb_shark_probe(struct usb_interface *intf,
+                           const struct usb_device_id *id)
+{
+        struct shark_device *shark;
+        int i, retval = -ENOMEM;
+
+        shark = kzalloc(sizeof(struct shark_device), GFP_KERNEL);
+        if (!shark)
+                return retval;
+
+        shark->transfer_buffer = kmalloc(TB_LEN, GFP_KERNEL);
+        if (!shark->transfer_buffer)
+                goto err_alloc_buffer;
+
+        /*
+         * Work around a bug in usbhid/hid-core.c, where it leaves a dangling
+         * pointer in intfdata causing v4l2-device.c to not set it. Which
+         * results in usb_shark_disconnect() referencing the dangling pointer
+         *
+         * REMOVE (as soon as the above bug is fixed, patch submitted)
+         */
+        usb_set_intfdata(intf, NULL);
+
+        shark->v4l2_dev.release = usb_shark_release;
+        v4l2_device_set_name(&shark->v4l2_dev, DRV_NAME, &shark_instance);
+        retval = v4l2_device_register(&intf->dev, &shark->v4l2_dev);
+        if (retval) {
+                v4l2_err(&shark->v4l2_dev, "couldn't register v4l2_device\n");
+                goto err_reg_dev;
+        }
+
+        shark->usbdev = interface_to_usbdev(intf);
+        shark->tea.v4l2_dev = &shark->v4l2_dev;
+        shark->tea.private_data = shark;
+        shark->tea.radio_nr = -1;
+        shark->tea.ops = &shark_tea_ops;
+        shark->tea.cannot_mute = true;
+        strlcpy(shark->tea.card, "Griffin radioSHARK",
+                sizeof(shark->tea.card));
+        usb_make_path(shark->usbdev, shark->tea.bus_info,
+                sizeof(shark->tea.bus_info));
+
+        retval = snd_tea575x_init(&shark->tea, THIS_MODULE);
+        if (retval) {
+                v4l2_err(&shark->v4l2_dev, "couldn't init tea5757\n");
+                goto err_init_tea;
+        }
+
+        INIT_WORK(&shark->led_work, shark_led_work);
+        for (i = 0; i < NO_LEDS; i++) {
+                shark->leds[i] = shark_led_templates[i];
+                snprintf(shark->led_names[i], sizeof(shark->led_names[0]),
+                         shark->leds[i].name, shark->v4l2_dev.name);
+                shark->leds[i].name = shark->led_names[i];
+                /*
+                 * We don't fail the probe if we fail to register the leds,
+                 * because once we've called snd_tea575x_init, the /dev/radio0
+                 * node may be opened from userspace holding a reference to us!
+                 *
+                 * Note we cannot register the leds first instead as
+                 * shark_led_work depends on the v4l2 mutex and registered bit.
+                 */
+                retval = led_classdev_register(&intf->dev, &shark->leds[i]);
+                if (retval)
+                        v4l2_err(&shark->v4l2_dev,
+                                 "couldn't register led: %s\n",
+                                 shark->led_names[i]);
+        }
+
+        return 0;
+
+err_init_tea:
+        v4l2_device_unregister(&shark->v4l2_dev);
+err_reg_dev:
+        kfree(shark->transfer_buffer);
+err_alloc_buffer:
+        kfree(shark);
+
+        return retval;
+}
+
+/* Specify the bcdDevice value, as the radioSHARK and radioSHARK2 share ids */
+static struct usb_device_id usb_shark_device_table[] = {
+        { .match_flags = USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION |
+                         USB_DEVICE_ID_MATCH_INT_CLASS,
+          .idVendor     = 0x077d,
+          .idProduct    = 0x627a,
+          .bcdDevice_lo = 0x0001,
+          .bcdDevice_hi = 0x0001,
+          .bInterfaceClass = 3,
+        },
+        { }
+};
+MODULE_DEVICE_TABLE(usb, usb_shark_device_table);
+
+static struct usb_driver usb_shark_driver = {
+        .name                   = DRV_NAME,
+        .probe                  = usb_shark_probe,
+        .disconnect             = usb_shark_disconnect,
+        .id_table               = usb_shark_device_table,
+};
+module_usb_driver(usb_shark_driver);
diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
new file mode 100644
index 000000000000..b9575de3e7e8
--- /dev/null
+++ b/drivers/media/radio/radio-shark2.c
@@ -0,0 +1,348 @@
+/*
+ * Linux V4L2 radio driver for the Griffin radioSHARK2 USB radio receiver
+ *
+ * Note the radioSHARK2 offers the audio through a regular USB audio device,
+ * this driver only handles the tuning.
+ *
+ * The info necessary to drive the shark2 was taken from the small userspace
+ * shark2.c program by Hisaaki Shibata, which he kindly placed in the Public
+ * Domain.
+ *
+ * Copyright (c) 2012 Hans de Goede <hdegoede@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/leds.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/usb.h>
+#include <linux/workqueue.h>
+#include <media/v4l2-device.h>
+#include "radio-tea5777.h"
+
+MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
+MODULE_DESCRIPTION("Griffin radioSHARK2, USB radio receiver driver");
+MODULE_LICENSE("GPL");
+
+static int debug;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "Debug level (0-1)");
+
+
+#define SHARK_IN_EP             0x83
+#define SHARK_OUT_EP            0x05
+
+#define TB_LEN 7
+#define DRV_NAME "radioshark2"
+
+#define v4l2_dev_to_shark(d) container_of(d, struct shark_device, v4l2_dev)
+
+enum { BLUE_LED, RED_LED, NO_LEDS };
+
+static void shark_led_set_blue(struct led_classdev *led_cdev,
+                               enum led_brightness value);
+static void shark_led_set_red(struct led_classdev *led_cdev,
+                              enum led_brightness value);
+
+static const struct led_classdev shark_led_templates[NO_LEDS] = {
+        [BLUE_LED] = {
+                .name           = "%s:blue:",
+                .brightness     = LED_OFF,
+                .max_brightness = 127,
+                .brightness_set = shark_led_set_blue,
+        },
+        [RED_LED] = {
+                .name           = "%s:red:",
+                .brightness     = LED_OFF,
+                .max_brightness = 1,
+                .brightness_set = shark_led_set_red,
+        },
+};
+
+struct shark_device {
+        struct usb_device *usbdev;
+        struct v4l2_device v4l2_dev;
+        struct radio_tea5777 tea;
+
+        struct work_struct led_work;
+        struct led_classdev leds[NO_LEDS];
+        char led_names[NO_LEDS][32];
+        atomic_t brightness[NO_LEDS];
+        unsigned long brightness_new;
+
+        u8 *transfer_buffer;
+};
+
+static atomic_t shark_instance = ATOMIC_INIT(0);
+
+static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
+{
+        struct shark_device *shark = tea->private_data;
+        int i, res, actual_len;
+
+        memset(shark->transfer_buffer, 0, TB_LEN);
+        shark->transfer_buffer[0] = 0x81; /* Write register command */
+        for (i = 0; i < 6; i++)
+                shark->transfer_buffer[i + 1] = (reg >> (40 - i * 8)) & 0xff;
+
+        v4l2_dbg(1, debug, tea->v4l2_dev,
+                 "shark2-write: %02x %02x %02x %02x %02x %02x %02x\n",
+                 shark->transfer_buffer[0], shark->transfer_buffer[1],
+                 shark->transfer_buffer[2], shark->transfer_buffer[3],
+                 shark->transfer_buffer[4], shark->transfer_buffer[5],
+                 shark->transfer_buffer[6]);
+
+        res = usb_interrupt_msg(shark->usbdev,
+                                usb_sndintpipe(shark->usbdev, SHARK_OUT_EP),
+                                shark->transfer_buffer, TB_LEN,
+                                &actual_len, 1000);
+        if (res < 0) {
+                v4l2_err(tea->v4l2_dev, "write error: %d\n", res);
+                return res;
+        }
+
+        return 0;
+}
+
+static int shark_read_reg(struct radio_tea5777 *tea, u32 *reg_ret)
+{
+        struct shark_device *shark = tea->private_data;
+        int i, res, actual_len;
+        u32 reg = 0;
+
+        memset(shark->transfer_buffer, 0, TB_LEN);
+        shark->transfer_buffer[0] = 0x82;
+        res = usb_interrupt_msg(shark->usbdev,
+                                usb_sndintpipe(shark->usbdev, SHARK_OUT_EP),
+                                shark->transfer_buffer, TB_LEN,
+                                &actual_len, 1000);
+        if (res < 0) {
+                v4l2_err(tea->v4l2_dev, "request-read error: %d\n", res);
+                return res;
+        }
+
+        res = usb_interrupt_msg(shark->usbdev,
+                                usb_rcvintpipe(shark->usbdev, SHARK_IN_EP),
+                                shark->transfer_buffer, TB_LEN,
+                                &actual_len, 1000);
+        if (res < 0) {
+                v4l2_err(tea->v4l2_dev, "read error: %d\n", res);
+                return res;
+        }
+
+        for (i = 0; i < 3; i++)
+                reg |= shark->transfer_buffer[i] << (16 - i * 8);
+
+        v4l2_dbg(1, debug, tea->v4l2_dev, "shark2-read: %02x %02x %02x\n",
+                 shark->transfer_buffer[0], shark->transfer_buffer[1],
+                 shark->transfer_buffer[2]);
+
+        *reg_ret = reg;
+        return 0;
+}
+
+static struct radio_tea5777_ops shark_tea_ops = {
+        .write_reg = shark_write_reg,
+        .read_reg  = shark_read_reg,
+};
+
+static void shark_led_work(struct work_struct *work)
+{
+        struct shark_device *shark =
+                container_of(work, struct shark_device, led_work);
+        int i, res, brightness, actual_len;
+        /*
+         * We use the v4l2_dev lock and registered bit to ensure the device
+         * does not get unplugged and unreffed while we're running.
+         */
+        mutex_lock(&shark->tea.mutex);
+        if (!video_is_registered(&shark->tea.vd))
+                goto leave;
+
+        for (i = 0; i < 2; i++) {
+                if (!test_and_clear_bit(i, &shark->brightness_new))
+                        continue;
+
+                brightness = atomic_read(&shark->brightness[i]);
+                memset(shark->transfer_buffer, 0, TB_LEN);
+                shark->transfer_buffer[0] = 0x83 + i;
+                shark->transfer_buffer[1] = brightness;
+                res = usb_interrupt_msg(shark->usbdev,
+                                        usb_sndintpipe(shark->usbdev,
+                                                       SHARK_OUT_EP),
+                                        shark->transfer_buffer, TB_LEN,
+                                        &actual_len, 1000);
+                if (res < 0)
+                        v4l2_err(&shark->v4l2_dev, "set LED %s error: %d\n",
+                                 shark->led_names[i], res);
+        }
+leave:
+        mutex_unlock(&shark->tea.mutex);
+}
+
+static void shark_led_set_blue(struct led_classdev *led_cdev,
+                               enum led_brightness value)
+{
+        struct shark_device *shark =
+                container_of(led_cdev, struct shark_device, leds[BLUE_LED]);
+
+        atomic_set(&shark->brightness[BLUE_LED], value);
+        set_bit(BLUE_LED, &shark->brightness_new);
+        schedule_work(&shark->led_work);
+}
+
+static void shark_led_set_red(struct led_classdev *led_cdev,
+                              enum led_brightness value)
+{
+        struct shark_device *shark =
+                container_of(led_cdev, struct shark_device, leds[RED_LED]);
+
+        atomic_set(&shark->brightness[RED_LED], value);
+        set_bit(RED_LED, &shark->brightness_new);
+        schedule_work(&shark->led_work);
+}
+
+static void usb_shark_disconnect(struct usb_interface *intf)
+{
+        struct v4l2_device *v4l2_dev = usb_get_intfdata(intf);
+        struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);
+        int i;
+
+        mutex_lock(&shark->tea.mutex);
+        v4l2_device_disconnect(&shark->v4l2_dev);
+        radio_tea5777_exit(&shark->tea);
+        mutex_unlock(&shark->tea.mutex);
+
+        for (i = 0; i < NO_LEDS; i++)
+                led_classdev_unregister(&shark->leds[i]);
+
+        v4l2_device_put(&shark->v4l2_dev);
+}
+
+static void usb_shark_release(struct v4l2_device *v4l2_dev)
+{
+        struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);
+
+        cancel_work_sync(&shark->led_work);
+        v4l2_device_unregister(&shark->v4l2_dev);
+        kfree(shark->transfer_buffer);
+        kfree(shark);
+}
+
+static int usb_shark_probe(struct usb_interface *intf,
+                           const struct usb_device_id *id)
+{
+        struct shark_device *shark;
+        int i, retval = -ENOMEM;
+
+        shark = kzalloc(sizeof(struct shark_device), GFP_KERNEL);
+        if (!shark)
+                return retval;
+
+        shark->transfer_buffer = kmalloc(TB_LEN, GFP_KERNEL);
+        if (!shark->transfer_buffer)
+                goto err_alloc_buffer;
+
+        /*
+         * Work around a bug in usbhid/hid-core.c, where it leaves a dangling
+         * pointer in intfdata causing v4l2-device.c to not set it. Which
+         * results in usb_shark_disconnect() referencing the dangling pointer
+         *
+         * REMOVE (as soon as the above bug is fixed, patch submitted)
+         */
+        usb_set_intfdata(intf, NULL);
+
+        shark->v4l2_dev.release = usb_shark_release;
+        v4l2_device_set_name(&shark->v4l2_dev, DRV_NAME, &shark_instance);
+        retval = v4l2_device_register(&intf->dev, &shark->v4l2_dev);
+        if (retval) {
+                v4l2_err(&shark->v4l2_dev, "couldn't register v4l2_device\n");
+                goto err_reg_dev;
+        }
+
+        shark->usbdev = interface_to_usbdev(intf);
+        shark->tea.v4l2_dev = &shark->v4l2_dev;
+        shark->tea.private_data = shark;
+        shark->tea.ops = &shark_tea_ops;
+        shark->tea.has_am = true;
+        shark->tea.write_before_read = true;
+        strlcpy(shark->tea.card, "Griffin radioSHARK2",
+                sizeof(shark->tea.card));
+        usb_make_path(shark->usbdev, shark->tea.bus_info,
+                sizeof(shark->tea.bus_info));
+
+        retval = radio_tea5777_init(&shark->tea, THIS_MODULE);
+        if (retval) {
+                v4l2_err(&shark->v4l2_dev, "couldn't init tea5777\n");
+                goto err_init_tea;
+        }
+
+        INIT_WORK(&shark->led_work, shark_led_work);
+        for (i = 0; i < NO_LEDS; i++) {
+                shark->leds[i] = shark_led_templates[i];
+                snprintf(shark->led_names[i], sizeof(shark->led_names[0]),
+                         shark->leds[i].name, shark->v4l2_dev.name);
+                shark->leds[i].name = shark->led_names[i];
+                /*
+                 * We don't fail the probe if we fail to register the leds,
+                 * because once we've called radio_tea5777_init, the /dev/radio0
+                 * node may be opened from userspace holding a reference to us!
+                 *
+                 * Note we cannot register the leds first instead as
+                 * shark_led_work depends on the v4l2 mutex and registered bit.
+                 */
+                retval = led_classdev_register(&intf->dev, &shark->leds[i]);
+                if (retval)
+                        v4l2_err(&shark->v4l2_dev,
+                                 "couldn't register led: %s\n",
+                                 shark->led_names[i]);
+        }
+
+        return 0;
+
+err_init_tea:
+        v4l2_device_unregister(&shark->v4l2_dev);
+err_reg_dev:
+        kfree(shark->transfer_buffer);
+err_alloc_buffer:
+        kfree(shark);
+
+        return retval;
+}
+
+/* Specify the bcdDevice value, as the radioSHARK and radioSHARK2 share ids */
+static struct usb_device_id usb_shark_device_table[] = {
+        { .match_flags = USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION |
+                         USB_DEVICE_ID_MATCH_INT_CLASS,
+          .idVendor     = 0x077d,
+          .idProduct    = 0x627a,
+          .bcdDevice_lo = 0x0010,
+          .bcdDevice_hi = 0x0010,
+          .bInterfaceClass = 3,
+        },
+        { }
+};
+MODULE_DEVICE_TABLE(usb, usb_shark_device_table);
+
+static struct usb_driver usb_shark_driver = {
+        .name                   = DRV_NAME,
+        .probe                  = usb_shark_probe,
+        .disconnect             = usb_shark_disconnect,
+        .id_table               = usb_shark_device_table,
+};
+module_usb_driver(usb_shark_driver);
diff --git a/drivers/media/radio/radio-tea5777.c b/drivers/media/radio/radio-tea5777.c
new file mode 100644
index 000000000000..5bc9fa62720b
--- /dev/null
+++ b/drivers/media/radio/radio-tea5777.c
@@ -0,0 +1,491 @@
+/*
+ *   v4l2 driver for TEA5777 Philips AM/FM radio tuner chips
+ *
+ *      Copyright (c) 2012 Hans de Goede <hdegoede@redhat.com>
+ *
+ *   Based on the ALSA driver for TEA5757/5759 Philips AM/FM radio tuner chips:
+ *
+ *      Copyright (c) 2004 Jaroslav Kysela <perex@perex.cz>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-dev.h>
+#include <media/v4l2-fh.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-event.h>
+#include <asm/div64.h>
+#include "radio-tea5777.h"
+
+MODULE_AUTHOR("Hans de Goede <perex@perex.cz>");
+MODULE_DESCRIPTION("Routines for control of TEA5777 Philips AM/FM radio tuner chips");
+MODULE_LICENSE("GPL");
+
+/* Fixed FM only band for now, will implement multi-band support when the
+   VIDIOC_ENUM_FREQ_BANDS API is upstream */
+#define TEA5777_FM_RANGELOW             (76000 * 16)
+#define TEA5777_FM_RANGEHIGH            (108000 * 16)
+
+#define TEA5777_FM_IF                   150 /* kHz */
+#define TEA5777_FM_FREQ_STEP            50 /* kHz */
+
+/* Write reg, common bits */
+#define TEA5777_W_MUTE_MASK             (1LL << 47)
+#define TEA5777_W_MUTE_SHIFT            47
+#define TEA5777_W_AM_FM_MASK            (1LL << 46)
+#define TEA5777_W_AM_FM_SHIFT           46
+#define TEA5777_W_STB_MASK              (1LL << 45)
+#define TEA5777_W_STB_SHIFT             45
+
+#define TEA5777_W_IFCE_MASK             (1LL << 29)
+#define TEA5777_W_IFCE_SHIFT            29
+#define TEA5777_W_IFW_MASK              (1LL << 28)
+#define TEA5777_W_IFW_SHIFT             28
+#define TEA5777_W_HILO_MASK             (1LL << 27)
+#define TEA5777_W_HILO_SHIFT            27
+#define TEA5777_W_DBUS_MASK             (1LL << 26)
+#define TEA5777_W_DBUS_SHIFT            26
+
+#define TEA5777_W_INTEXT_MASK           (1LL << 24)
+#define TEA5777_W_INTEXT_SHIFT          24
+#define TEA5777_W_P1_MASK               (1LL << 23)
+#define TEA5777_W_P1_SHIFT              23
+#define TEA5777_W_P0_MASK               (1LL << 22)
+#define TEA5777_W_P0_SHIFT              22
+#define TEA5777_W_PEN1_MASK             (1LL << 21)
+#define TEA5777_W_PEN1_SHIFT            21
+#define TEA5777_W_PEN0_MASK             (1LL << 20)
+#define TEA5777_W_PEN0_SHIFT            20
+
+#define TEA5777_W_CHP0_MASK             (1LL << 18)
+#define TEA5777_W_CHP0_SHIFT            18
+#define TEA5777_W_DEEM_MASK             (1LL << 17)
+#define TEA5777_W_DEEM_SHIFT            17
+
+#define TEA5777_W_SEARCH_MASK           (1LL << 7)
+#define TEA5777_W_SEARCH_SHIFT          7
+#define TEA5777_W_PROGBLIM_MASK         (1LL << 6)
+#define TEA5777_W_PROGBLIM_SHIFT        6
+#define TEA5777_W_UPDWN_MASK            (1LL << 5)
+#define TEA5777_W_UPDWN_SHIFT           5
+#define TEA5777_W_SLEV_MASK             (3LL << 3)
+#define TEA5777_W_SLEV_SHIFT            3
+
+/* Write reg, FM specific bits */
+#define TEA5777_W_FM_PLL_MASK           (0x1fffLL << 32)
+#define TEA5777_W_FM_PLL_SHIFT          32
+#define TEA5777_W_FM_FREF_MASK          (0x03LL << 30)
+#define TEA5777_W_FM_FREF_SHIFT         30
+#define TEA5777_W_FM_FREF_VALUE         0 /* 50 kHz tune steps, 150 kHz IF */
+
+#define TEA5777_W_FM_FORCEMONO_MASK     (1LL << 15)
+#define TEA5777_W_FM_FORCEMONO_SHIFT    15
+#define TEA5777_W_FM_SDSOFF_MASK        (1LL << 14)
+#define TEA5777_W_FM_SDSOFF_SHIFT       14
+#define TEA5777_W_FM_DOFF_MASK          (1LL << 13)
+#define TEA5777_W_FM_DOFF_SHIFT         13
+
+#define TEA5777_W_FM_STEP_MASK          (3LL << 1)
+#define TEA5777_W_FM_STEP_SHIFT         1
+
+/* Write reg, AM specific bits */
+#define TEA5777_W_AM_PLL_MASK           (0x7ffLL << 34)
+#define TEA5777_W_AM_PLL_SHIFT          34
+#define TEA5777_W_AM_AGCRF_MASK         (1LL << 33)
+#define TEA5777_W_AM_AGCRF_SHIFT        33
+#define TEA5777_W_AM_AGCIF_MASK         (1LL << 32)
+#define TEA5777_W_AM_AGCIF_SHIFT        32
+#define TEA5777_W_AM_MWLW_MASK          (1LL << 31)
+#define TEA5777_W_AM_MWLW_SHIFT         31
+#define TEA5777_W_AM_LNA_MASK           (1LL << 30)
+#define TEA5777_W_AM_LNA_SHIFT          30
+
+#define TEA5777_W_AM_PEAK_MASK          (1LL << 25)
+#define TEA5777_W_AM_PEAK_SHIFT         25
+
+#define TEA5777_W_AM_RFB_MASK           (1LL << 16)
+#define TEA5777_W_AM_RFB_SHIFT          16
+#define TEA5777_W_AM_CALLIGN_MASK       (1LL << 15)
+#define TEA5777_W_AM_CALLIGN_SHIFT      15
+#define TEA5777_W_AM_CBANK_MASK         (0x7fLL << 8)
+#define TEA5777_W_AM_CBANK_SHIFT        8
+
+#define TEA5777_W_AM_DELAY_MASK         (1LL << 2)
+#define TEA5777_W_AM_DELAY_SHIFT        2
+#define TEA5777_W_AM_STEP_MASK          (1LL << 1)
+#define TEA5777_W_AM_STEP_SHIFT         1
+
+/* Read reg, common bits */
+#define TEA5777_R_LEVEL_MASK            (0x0f << 17)
+#define TEA5777_R_LEVEL_SHIFT           17
+#define TEA5777_R_SFOUND_MASK           (0x01 << 16)
+#define TEA5777_R_SFOUND_SHIFT          16
+#define TEA5777_R_BLIM_MASK             (0x01 << 15)
+#define TEA5777_R_BLIM_SHIFT            15
+
+/* Read reg, FM specific bits */
+#define TEA5777_R_FM_STEREO_MASK        (0x01 << 21)
+#define TEA5777_R_FM_STEREO_SHIFT       21
+#define TEA5777_R_FM_PLL_MASK           0x1fff
+#define TEA5777_R_FM_PLL_SHIFT          0
+
+static u32 tea5777_freq_to_v4l2_freq(struct radio_tea5777 *tea, u32 freq)
+{
+        return (freq * TEA5777_FM_FREQ_STEP + TEA5777_FM_IF) * 16;
+}
+
+static int radio_tea5777_set_freq(struct radio_tea5777 *tea)
+{
+        u64 freq;
+        int res;
+
+        freq = clamp_t(u32, tea->freq,
+                       TEA5777_FM_RANGELOW, TEA5777_FM_RANGEHIGH) + 8;
+        do_div(freq, 16); /* to kHz */
+
+        freq -= TEA5777_FM_IF;
+        do_div(freq, TEA5777_FM_FREQ_STEP);
+
+        tea->write_reg &= ~(TEA5777_W_FM_PLL_MASK | TEA5777_W_FM_FREF_MASK);
+        tea->write_reg |= freq << TEA5777_W_FM_PLL_SHIFT;
+        tea->write_reg |= TEA5777_W_FM_FREF_VALUE << TEA5777_W_FM_FREF_SHIFT;
+
+        res = tea->ops->write_reg(tea, tea->write_reg);
+        if (res)
+                return res;
+
+        tea->needs_write = false;
+        tea->read_reg = -1;
+        tea->freq = tea5777_freq_to_v4l2_freq(tea, freq);
+
+        return 0;
+}
+
+static int radio_tea5777_update_read_reg(struct radio_tea5777 *tea, int wait)
+{
+        int res;
+
+        if (tea->read_reg != -1)
+                return 0;
+
+        if (tea->write_before_read && tea->needs_write) {
+                res = radio_tea5777_set_freq(tea);
+                if (res)
+                        return res;
+        }
+
+        if (wait) {
+                if (schedule_timeout_interruptible(msecs_to_jiffies(wait)))
+                        return -ERESTARTSYS;
+        }
+
+        res = tea->ops->read_reg(tea, &tea->read_reg);
+        if (res)
+                return res;
+
+        tea->needs_write = true;
+        return 0;
+}
+
+/*
+ * Linux Video interface
+ */
+
+static int vidioc_querycap(struct file *file, void  *priv,
+                                        struct v4l2_capability *v)
+{
+        struct radio_tea5777 *tea = video_drvdata(file);
+
+        strlcpy(v->driver, tea->v4l2_dev->name, sizeof(v->driver));
+        strlcpy(v->card, tea->card, sizeof(v->card));
+        strlcat(v->card, " TEA5777", sizeof(v->card));
+        strlcpy(v->bus_info, tea->bus_info, sizeof(v->bus_info));
+        v->device_caps = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
+        v->device_caps |= V4L2_CAP_HW_FREQ_SEEK;
+        v->capabilities = v->device_caps | V4L2_CAP_DEVICE_CAPS;
+        return 0;
+}
+
+static int vidioc_g_tuner(struct file *file, void *priv,
+                                        struct v4l2_tuner *v)
+{
+        struct radio_tea5777 *tea = video_drvdata(file);
+        int res;
+
+        if (v->index > 0)
+                return -EINVAL;
+
+        res = radio_tea5777_update_read_reg(tea, 0);
+        if (res)
+                return res;
+
+        memset(v, 0, sizeof(*v));
+        if (tea->has_am)
+                strlcpy(v->name, "AM/FM", sizeof(v->name));
+        else
+                strlcpy(v->name, "FM", sizeof(v->name));
+        v->type = V4L2_TUNER_RADIO;
+        v->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
+                        V4L2_TUNER_CAP_HWSEEK_BOUNDED;
+        v->rangelow   = TEA5777_FM_RANGELOW;
+        v->rangehigh  = TEA5777_FM_RANGEHIGH;
+        v->rxsubchans = (tea->read_reg & TEA5777_R_FM_STEREO_MASK) ?
+                        V4L2_TUNER_SUB_STEREO : V4L2_TUNER_SUB_MONO;
+        v->audmode = (tea->write_reg & TEA5777_W_FM_FORCEMONO_MASK) ?
+                V4L2_TUNER_MODE_MONO : V4L2_TUNER_MODE_STEREO;
+        /* shift - 12 to convert 4-bits (0-15) scale to 16-bits (0-65535) */
+        v->signal = (tea->read_reg & TEA5777_R_LEVEL_MASK) >>
+                    (TEA5777_R_LEVEL_SHIFT - 12);
+
+        /* Invalidate read_reg, so that next call we return up2date signal */
+        tea->read_reg = -1;
+
+        return 0;
+}
+
+static int vidioc_s_tuner(struct file *file, void *priv,
+                                        struct v4l2_tuner *v)
+{
+        struct radio_tea5777 *tea = video_drvdata(file);
+
+        if (v->index)
+                return -EINVAL;
+
+        if (v->audmode == V4L2_TUNER_MODE_MONO)
+                tea->write_reg |= TEA5777_W_FM_FORCEMONO_MASK;
+        else
+                tea->write_reg &= ~TEA5777_W_FM_FORCEMONO_MASK;
+
+        return radio_tea5777_set_freq(tea);
+}
+
+static int vidioc_g_frequency(struct file *file, void *priv,
+                                        struct v4l2_frequency *f)
+{
+        struct radio_tea5777 *tea = video_drvdata(file);
+
+        if (f->tuner != 0)
+                return -EINVAL;
+        f->type = V4L2_TUNER_RADIO;
+        f->frequency = tea->freq;
+        return 0;
+}
+
+static int vidioc_s_frequency(struct file *file, void *priv,
+                                        struct v4l2_frequency *f)
+{
+        struct radio_tea5777 *tea = video_drvdata(file);
+
+        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
+                return -EINVAL;
+
+        tea->freq = f->frequency;
+        return radio_tea5777_set_freq(tea);
+}
+
+static int vidioc_s_hw_freq_seek(struct file *file, void *fh,
+                                        struct v4l2_hw_freq_seek *a)
+{
+        struct radio_tea5777 *tea = video_drvdata(file);
+        u32 orig_freq = tea->freq;
+        unsigned long timeout;
+        int res, spacing = 200 * 16; /* 200 kHz */
+        /* These are fixed *for now* */
+        const u32 seek_rangelow  = TEA5777_FM_RANGELOW;
+        const u32 seek_rangehigh = TEA5777_FM_RANGEHIGH;
+
+        if (a->tuner || a->wrap_around)
+                return -EINVAL;
+
+        tea->write_reg |= TEA5777_W_PROGBLIM_MASK;
+        if (seek_rangelow != tea->seek_rangelow) {
+                tea->write_reg &= ~TEA5777_W_UPDWN_MASK;
+                tea->freq = seek_rangelow;
+                res = radio_tea5777_set_freq(tea);
+                if (res)
+                        goto leave;
+                tea->seek_rangelow = tea->freq;
+        }
+        if (seek_rangehigh != tea->seek_rangehigh) {
+                tea->write_reg |= TEA5777_W_UPDWN_MASK;
+                tea->freq = seek_rangehigh;
+                res = radio_tea5777_set_freq(tea);
+                if (res)
+                        goto leave;
+                tea->seek_rangehigh = tea->freq;
+        }
+        tea->write_reg &= ~TEA5777_W_PROGBLIM_MASK;
+
+        tea->write_reg |= TEA5777_W_SEARCH_MASK;
+        if (a->seek_upward) {
+                tea->write_reg |= TEA5777_W_UPDWN_MASK;
+                tea->freq = orig_freq + spacing;
+        } else {
+                tea->write_reg &= ~TEA5777_W_UPDWN_MASK;
+                tea->freq = orig_freq - spacing;
+        }
+        res = radio_tea5777_set_freq(tea);
+        if (res)
+                goto leave;
+
+        timeout = jiffies + msecs_to_jiffies(5000);
+        for (;;) {
+                if (time_after(jiffies, timeout)) {
+                        res = -ENODATA;
+                        break;
+                }
+
+                res = radio_tea5777_update_read_reg(tea, 100);
+                if (res)
+                        break;
+
+                /*
+                 * Note we use tea->freq to track how far we've searched sofar
+                 * this is necessary to ensure we continue seeking at the right
+                 * point, in the write_before_read case.
+                 */
+                tea->freq = (tea->read_reg & TEA5777_R_FM_PLL_MASK);
+                tea->freq = tea5777_freq_to_v4l2_freq(tea, tea->freq);
+
+                if ((tea->read_reg & TEA5777_R_SFOUND_MASK)) {
+                        tea->write_reg &= ~TEA5777_W_SEARCH_MASK;
+                        return 0;
+                }
+
+                if (tea->read_reg & TEA5777_R_BLIM_MASK) {
+                        res = -ENODATA;
+                        break;
+                }
+
+                /* Force read_reg update */
+                tea->read_reg = -1;
+        }
+leave:
+        tea->write_reg &= ~TEA5777_W_PROGBLIM_MASK;
+        tea->write_reg &= ~TEA5777_W_SEARCH_MASK;
+        tea->freq = orig_freq;
+        radio_tea5777_set_freq(tea);
+        return res;
+}
+
+static int tea575x_s_ctrl(struct v4l2_ctrl *c)
+{
+        struct radio_tea5777 *tea =
+                container_of(c->handler, struct radio_tea5777, ctrl_handler);
+
+        switch (c->id) {
+        case V4L2_CID_AUDIO_MUTE:
+                if (c->val)
+                        tea->write_reg |= TEA5777_W_MUTE_MASK;
+                else
+                        tea->write_reg &= ~TEA5777_W_MUTE_MASK;
+
+                return radio_tea5777_set_freq(tea);
+        }
+
+        return -EINVAL;
+}
+
+static const struct v4l2_file_operations tea575x_fops = {
+        .unlocked_ioctl = video_ioctl2,
+        .open           = v4l2_fh_open,
+        .release        = v4l2_fh_release,
+        .poll           = v4l2_ctrl_poll,
+};
+
+static const struct v4l2_ioctl_ops tea575x_ioctl_ops = {
+        .vidioc_querycap    = vidioc_querycap,
+        .vidioc_g_tuner     = vidioc_g_tuner,
+        .vidioc_s_tuner     = vidioc_s_tuner,
+        .vidioc_g_frequency = vidioc_g_frequency,
+        .vidioc_s_frequency = vidioc_s_frequency,
+        .vidioc_s_hw_freq_seek = vidioc_s_hw_freq_seek,
+        .vidioc_log_status  = v4l2_ctrl_log_status,
+        .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
+        .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
+};
+
+static const struct video_device tea575x_radio = {
+        .ioctl_ops      = &tea575x_ioctl_ops,
+        .release        = video_device_release_empty,
+};
+
+static const struct v4l2_ctrl_ops tea575x_ctrl_ops = {
+        .s_ctrl = tea575x_s_ctrl,
+};
+
+int radio_tea5777_init(struct radio_tea5777 *tea, struct module *owner)
+{
+        int res;
+
+        tea->write_reg = (1LL << TEA5777_W_IFCE_SHIFT) |
+                         (1LL << TEA5777_W_IFW_SHIFT) |
+                         (1LL << TEA5777_W_INTEXT_SHIFT) |
+                         (1LL << TEA5777_W_CHP0_SHIFT) |
+                         (2LL << TEA5777_W_SLEV_SHIFT);
+        tea->freq = 90500 * 16; /* 90.5Mhz default */
+        res = radio_tea5777_set_freq(tea);
+        if (res) {
+                v4l2_err(tea->v4l2_dev, "can't set initial freq (%d)\n", res);
+                return res;
+        }
+
+        tea->vd = tea575x_radio;
+        video_set_drvdata(&tea->vd, tea);
+        mutex_init(&tea->mutex);
+        strlcpy(tea->vd.name, tea->v4l2_dev->name, sizeof(tea->vd.name));
+        tea->vd.lock = &tea->mutex;
+        tea->vd.v4l2_dev = tea->v4l2_dev;
+        tea->fops = tea575x_fops;
+        tea->fops.owner = owner;
+        tea->vd.fops = &tea->fops;
+        set_bit(V4L2_FL_USE_FH_PRIO, &tea->vd.flags);
+
+        tea->vd.ctrl_handler = &tea->ctrl_handler;
+        v4l2_ctrl_handler_init(&tea->ctrl_handler, 1);
+        v4l2_ctrl_new_std(&tea->ctrl_handler, &tea575x_ctrl_ops,
+                          V4L2_CID_AUDIO_MUTE, 0, 1, 1, 1);
+        res = tea->ctrl_handler.error;
+        if (res) {
+                v4l2_err(tea->v4l2_dev, "can't initialize controls\n");
+                v4l2_ctrl_handler_free(&tea->ctrl_handler);
+                return res;
+        }
+        v4l2_ctrl_handler_setup(&tea->ctrl_handler);
+
+        res = video_register_device(&tea->vd, VFL_TYPE_RADIO, -1);
+        if (res) {
+                v4l2_err(tea->v4l2_dev, "can't register video device!\n");
+                v4l2_ctrl_handler_free(tea->vd.ctrl_handler);
+                return res;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(radio_tea5777_init);
+
+void radio_tea5777_exit(struct radio_tea5777 *tea)
+{
+        video_unregister_device(&tea->vd);
+        v4l2_ctrl_handler_free(tea->vd.ctrl_handler);
+}
+EXPORT_SYMBOL_GPL(radio_tea5777_exit);
diff --git a/drivers/media/radio/radio-tea5777.h b/drivers/media/radio/radio-tea5777.h
new file mode 100644
index 000000000000..55cbd78df5ed
--- /dev/null
+++ b/drivers/media/radio/radio-tea5777.h
@@ -0,0 +1,87 @@
+#ifndef __RADIO_TEA5777_H
+#define __RADIO_TEA5777_H
+
+/*
+ *   v4l2 driver for TEA5777 Philips AM/FM radio tuner chips
+ *
+ *      Copyright (c) 2012 Hans de Goede <hdegoede@redhat.com>
+ *
+ *   Based on the ALSA driver for TEA5757/5759 Philips AM/FM radio tuner chips:
+ *
+ *      Copyright (c) 2004 Jaroslav Kysela <perex@perex.cz>
+ *      Copyright (c) 2012 Hans de Goede <hdegoede@redhat.com>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#include <linux/videodev2.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-dev.h>
+#include <media/v4l2-device.h>
+
+#define TEA575X_FMIF    10700
+#define TEA575X_AMIF      450
+
+struct radio_tea5777;
+
+struct radio_tea5777_ops {
+        /*
+         * Write the 6 bytes large write register of the tea5777
+         *
+         * val represents the 6 write registers, with byte 1 from the
+         * datasheet being the most significant byte (so byte 5 of the u64),
+         * and byte 6 from the datasheet being the least significant byte.
+         *
+         * returns 0 on success.
+         */
+        int (*write_reg)(struct radio_tea5777 *tea, u64 val);
+        /*
+         * Read the 3 bytes large read register of the tea5777
+         *
+         * The read value gets returned in val, akin to write_reg, byte 1 from
+         * the datasheet is stored as the most significant byte (so byte 2 of
+         * the u32), and byte 3 from the datasheet gets stored as the least
+         * significant byte (iow byte 0 of the u32).
+         *
+         * returns 0 on success.
+         */
+        int (*read_reg)(struct radio_tea5777 *tea, u32 *val);
+};
+
+struct radio_tea5777 {
+        struct v4l2_device *v4l2_dev;
+        struct v4l2_file_operations fops;
+        struct video_device vd;         /* video device */
+        bool has_am;                    /* Device can tune to AM freqs */
+        bool write_before_read;         /* must write before read quirk */
+        bool needs_write;               /* for write before read quirk */
+        u32 freq;                       /* current frequency */
+        u32 seek_rangelow;              /* current hwseek limits */
+        u32 seek_rangehigh;
+        u32 read_reg;
+        u64 write_reg;
+        struct mutex mutex;
+        struct radio_tea5777_ops *ops;
+        void *private_data;
+        u8 card[32];
+        u8 bus_info[32];
+        struct v4l2_ctrl_handler ctrl_handler;
+};
+
+int radio_tea5777_init(struct radio_tea5777 *tea, struct module *owner);
+void radio_tea5777_exit(struct radio_tea5777 *tea);
+
+#endif /* __RADIO_TEA5777_H */
diff --git a/drivers/media/radio/si470x/radio-si470x-common.c b/drivers/media/radio/si470x/radio-si470x-common.c
index d485b79222fd..9e38132afec6 100644
--- a/drivers/media/radio/si470x/radio-si470x-common.c
+++ b/drivers/media/radio/si470x/radio-si470x-common.c
@@ -4,6 +4,7 @@
  *  Driver for radios with Silicon Labs Si470x FM Radio Receivers
  *
  *  Copyright (c) 2009 Tobias Lorenz <tobias.lorenz@gmx.net>
+ *  Copyright (c) 2012 Hans de Goede <hdegoede@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -127,14 +128,6 @@ static unsigned short space = 2;
 module_param(space, ushort, 0444);
 MODULE_PARM_DESC(space, "Spacing: 0=200kHz 1=100kHz *2=50kHz*");
 
-/* Bottom of Band (MHz) */
-/* 0: 87.5 - 108 MHz (USA, Europe)*/
-/* 1: 76   - 108 MHz (Japan wide band) */
-/* 2: 76   -  90 MHz (Japan) */
-static unsigned short band = 1;
-module_param(band, ushort, 0444);
-MODULE_PARM_DESC(band, "Band: 0=87.5..108MHz *1=76..108MHz* 2=76..90MHz");
-
 /* De-emphasis */
 /* 0: 75 us (USA) */
 /* 1: 50 us (Europe, Australia, Japan) */
@@ -152,19 +145,66 @@ static unsigned int seek_timeout = 5000;
 module_param(seek_timeout, uint, 0644);
 MODULE_PARM_DESC(seek_timeout, "Seek timeout: *5000*");
 
-
+static const struct v4l2_frequency_band bands[] = {
+        {
+                .type = V4L2_TUNER_RADIO,
+                .index = 0,
+                .capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
+                            V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |
+                            V4L2_TUNER_CAP_HWSEEK_BOUNDED |
+                            V4L2_TUNER_CAP_HWSEEK_WRAP,
+                .rangelow   =  87500 * 16,
+                .rangehigh  = 108000 * 16,
+                .modulation = V4L2_BAND_MODULATION_FM,
+        },
+        {
+                .type = V4L2_TUNER_RADIO,
+                .index = 1,
+                .capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
+                            V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |
+                            V4L2_TUNER_CAP_HWSEEK_BOUNDED |
+                            V4L2_TUNER_CAP_HWSEEK_WRAP,
+                .rangelow   =  76000 * 16,
+                .rangehigh  = 108000 * 16,
+                .modulation = V4L2_BAND_MODULATION_FM,
+        },
+        {
+                .type = V4L2_TUNER_RADIO,
+                .index = 2,
+                .capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
+                            V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |
+                            V4L2_TUNER_CAP_HWSEEK_BOUNDED |
+                            V4L2_TUNER_CAP_HWSEEK_WRAP,
+                .rangelow   =  76000 * 16,
+                .rangehigh  =  90000 * 16,
+                .modulation = V4L2_BAND_MODULATION_FM,
+        },
+};
 
 /**************************************************************************
  * Generic Functions
  **************************************************************************/
 
 /*
+ * si470x_set_band - set the band
+ */
+static int si470x_set_band(struct si470x_device *radio, int band)
+{
+        if (radio->band == band)
+                return 0;
+
+        radio->band = band;
+        radio->registers[SYSCONFIG2] &= ~SYSCONFIG2_BAND;
+        radio->registers[SYSCONFIG2] |= radio->band << 6;
+        return si470x_set_register(radio, SYSCONFIG2);
+}
+
+/*
  * si470x_set_chan - set the channel
  */
 static int si470x_set_chan(struct si470x_device *radio, unsigned short chan)
 {
         int retval;
-        unsigned long timeout;
         bool timed_out = 0;
 
         /* start tuning */
@@ -174,26 +214,12 @@ static int si470x_set_chan(struct si470x_device *radio, unsigned short chan)
         if (retval < 0)
                 goto done;
 
-        /* currently I2C driver only uses interrupt way to tune */
-        if (radio->stci_enabled) {
-                INIT_COMPLETION(radio->completion);
-
-                /* wait till tune operation has completed */
-                retval = wait_for_completion_timeout(&radio->completion,
-                                msecs_to_jiffies(tune_timeout));
-                if (!retval)
-                        timed_out = true;
-        } else {
-                /* wait till tune operation has completed */
-                timeout = jiffies + msecs_to_jiffies(tune_timeout);
-                do {
-                        retval = si470x_get_register(radio, STATUSRSSI);
-                        if (retval < 0)
-                                goto stop;
-                        timed_out = time_after(jiffies, timeout);
-                } while (((radio->registers[STATUSRSSI] & STATUSRSSI_STC) == 0)
-                                && (!timed_out));
-        }
+        /* wait till tune operation has completed */
+        INIT_COMPLETION(radio->completion);
+        retval = wait_for_completion_timeout(&radio->completion,
+                        msecs_to_jiffies(tune_timeout));
+        if (!retval)
+                timed_out = true;
 
         if ((radio->registers[STATUSRSSI] & STATUSRSSI_STC) == 0)
                 dev_warn(&radio->videodev.dev, "tune does not complete\n");
@@ -201,7 +227,6 @@ static int si470x_set_chan(struct si470x_device *radio, unsigned short chan)
                 dev_warn(&radio->videodev.dev,
                         "tune timed out after %u ms\n", tune_timeout);
 
-stop:
         /* stop tuning */
         radio->registers[CHANNEL] &= ~CHANNEL_TUNE;
         retval = si470x_set_register(radio, CHANNEL);
@@ -210,48 +235,39 @@ done:
         return retval;
 }
 
-
 /*
- * si470x_get_freq - get the frequency
+ * si470x_get_step - get channel spacing
  */
-static int si470x_get_freq(struct si470x_device *radio, unsigned int *freq)
+static unsigned int si470x_get_step(struct si470x_device *radio)
 {
-        unsigned int spacing, band_bottom;
-        unsigned short chan;
-        int retval;
-
         /* Spacing (kHz) */
         switch ((radio->registers[SYSCONFIG2] & SYSCONFIG2_SPACE) >> 4) {
         /* 0: 200 kHz (USA, Australia) */
         case 0:
-                spacing = 0.200 * FREQ_MUL; break;
+                return 200 * 16;
         /* 1: 100 kHz (Europe, Japan) */
         case 1:
-                spacing = 0.100 * FREQ_MUL; break;
+                return 100 * 16;
         /* 2:  50 kHz */
         default:
-                spacing = 0.050 * FREQ_MUL; break;
+                return 50 * 16;
         };
+}
 
-        /* Bottom of Band (MHz) */
-        switch ((radio->registers[SYSCONFIG2] & SYSCONFIG2_BAND) >> 6) {
-        /* 0: 87.5 - 108 MHz (USA, Europe) */
-        case 0:
-                band_bottom = 87.5 * FREQ_MUL; break;
-        /* 1: 76   - 108 MHz (Japan wide band) */
-        default:
-                band_bottom = 76   * FREQ_MUL; break;
-        /* 2: 76   -  90 MHz (Japan) */
-        case 2:
-                band_bottom = 76   * FREQ_MUL; break;
-        };
+
+/*
+ * si470x_get_freq - get the frequency
+ */
+static int si470x_get_freq(struct si470x_device *radio, unsigned int *freq)
+{
+        int chan, retval;
 
         /* read channel */
         retval = si470x_get_register(radio, READCHAN);
         chan = radio->registers[READCHAN] & READCHAN_READCHAN;
 
         /* Frequency (MHz) = Spacing (kHz) x Channel + Bottom of Band (MHz) */
-        *freq = chan * spacing + band_bottom;
+        *freq = chan * si470x_get_step(radio) + bands[radio->band].rangelow;
 
         return retval;
 }
@@ -262,44 +278,12 @@ static int si470x_get_freq(struct si470x_device *radio, unsigned int *freq)
  */
 int si470x_set_freq(struct si470x_device *radio, unsigned int freq)
 {
-        unsigned int spacing, band_bottom, band_top;
         unsigned short chan;
 
-        /* Spacing (kHz) */
-        switch ((radio->registers[SYSCONFIG2] & SYSCONFIG2_SPACE) >> 4) {
-        /* 0: 200 kHz (USA, Australia) */
-        case 0:
-                spacing = 0.200 * FREQ_MUL; break;
-        /* 1: 100 kHz (Europe, Japan) */
-        case 1:
-                spacing = 0.100 * FREQ_MUL; break;
-        /* 2:  50 kHz */
-        default:
-                spacing = 0.050 * FREQ_MUL; break;
-        };
-
-        /* Bottom/Top of Band (MHz) */
-        switch ((radio->registers[SYSCONFIG2] & SYSCONFIG2_BAND) >> 6) {
-        /* 0: 87.5 - 108 MHz (USA, Europe) */
-        case 0:
-                band_bottom = 87.5 * FREQ_MUL;
-                band_top = 108 * FREQ_MUL;
-                break;
-        /* 1: 76   - 108 MHz (Japan wide band) */
-        default:
-                band_bottom = 76 * FREQ_MUL;
-                band_top = 108 * FREQ_MUL;
-                break;
-        /* 2: 76   -  90 MHz (Japan) */
-        case 2:
-                band_bottom = 76 * FREQ_MUL;
-                band_top = 90 * FREQ_MUL;
-                break;
-        };
-
-        freq = clamp(freq, band_bottom, band_top);
+        freq = clamp(freq, bands[radio->band].rangelow,
+                           bands[radio->band].rangehigh);
         /* Chan = [ Freq (Mhz) - Bottom of Band (MHz) ] / Spacing (kHz) */
-        chan = (freq - band_bottom) / spacing;
+        chan = (freq - bands[radio->band].rangelow) / si470x_get_step(radio);
 
         return si470x_set_chan(radio, chan);
 }
@@ -309,19 +293,43 @@ int si470x_set_freq(struct si470x_device *radio, unsigned int freq)
  * si470x_set_seek - set seek
  */
 static int si470x_set_seek(struct si470x_device *radio,
-                unsigned int wrap_around, unsigned int seek_upward)
+                           struct v4l2_hw_freq_seek *seek)
 {
-        int retval = 0;
-        unsigned long timeout;
+        int band, retval;
+        unsigned int freq;
         bool timed_out = 0;
 
+        /* set band */
+        if (seek->rangelow || seek->rangehigh) {
+                for (band = 0; band < ARRAY_SIZE(bands); band++) {
+                        if (bands[band].rangelow  == seek->rangelow &&
+                            bands[band].rangehigh == seek->rangehigh)
+                                break;
+                }
+                if (band == ARRAY_SIZE(bands))
+                        return -EINVAL; /* No matching band found */
+        } else
+                band = 1; /* If nothing is specified seek 76 - 108 Mhz */
+
+        if (radio->band != band) {
+                retval = si470x_get_freq(radio, &freq);
+                if (retval)
+                        return retval;
+                retval = si470x_set_band(radio, band);
+                if (retval)
+                        return retval;
+                retval = si470x_set_freq(radio, freq);
+                if (retval)
+                        return retval;
+        }
+
         /* start seeking */
         radio->registers[POWERCFG] |= POWERCFG_SEEK;
-        if (wrap_around == 1)
+        if (seek->wrap_around)
                 radio->registers[POWERCFG] &= ~POWERCFG_SKMODE;
         else
                 radio->registers[POWERCFG] |= POWERCFG_SKMODE;
-        if (seek_upward == 1)
+        if (seek->seek_upward)
                 radio->registers[POWERCFG] |= POWERCFG_SEEKUP;
         else
                 radio->registers[POWERCFG] &= ~POWERCFG_SEEKUP;
@@ -329,26 +337,12 @@ static int si470x_set_seek(struct si470x_device *radio,
         if (retval < 0)
                 return retval;
 
-        /* currently I2C driver only uses interrupt way to seek */
-        if (radio->stci_enabled) {
-                INIT_COMPLETION(radio->completion);
-
-                /* wait till seek operation has completed */
-                retval = wait_for_completion_timeout(&radio->completion,
-                                msecs_to_jiffies(seek_timeout));
-                if (!retval)
-                        timed_out = true;
-        } else {
-                /* wait till seek operation has completed */
-                timeout = jiffies + msecs_to_jiffies(seek_timeout);
-                do {
-                        retval = si470x_get_register(radio, STATUSRSSI);
-                        if (retval < 0)
-                                goto stop;
-                        timed_out = time_after(jiffies, timeout);
-                } while (((radio->registers[STATUSRSSI] & STATUSRSSI_STC) == 0)
-                                && (!timed_out));
-        }
+        /* wait till tune operation has completed */
+        INIT_COMPLETION(radio->completion);
+        retval = wait_for_completion_timeout(&radio->completion,
+                        msecs_to_jiffies(seek_timeout));
+        if (!retval)
+                timed_out = true;
 
         if ((radio->registers[STATUSRSSI] & STATUSRSSI_STC) == 0)
                 dev_warn(&radio->videodev.dev, "seek does not complete\n");
@@ -356,7 +350,6 @@ static int si470x_set_seek(struct si470x_device *radio,
                 dev_warn(&radio->videodev.dev,
                         "seek failed / band limit reached\n");
 
-stop:
         /* stop seeking */
         radio->registers[POWERCFG] &= ~POWERCFG_SEEK;
         retval = si470x_set_register(radio, POWERCFG);
@@ -391,8 +384,8 @@ int si470x_start(struct si470x_device *radio)
 
         /* sysconfig 2 */
         radio->registers[SYSCONFIG2] =
-                (0x3f  << 8) |                          /* SEEKTH */
-                ((band  << 6) & SYSCONFIG2_BAND)  |     /* BAND */
+                (0x1f  << 8) |                          /* SEEKTH */
+                ((radio->band << 6) & SYSCONFIG2_BAND) |/* BAND */
                 ((space << 4) & SYSCONFIG2_SPACE) |     /* SPACE */
                 15;                                     /* VOLUME (max) */
         retval = si470x_set_register(radio, SYSCONFIG2);
@@ -583,14 +576,16 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
                 struct v4l2_tuner *tuner)
 {
         struct si470x_device *radio = video_drvdata(file);
-        int retval;
+        int retval = 0;
 
         if (tuner->index != 0)
                 return -EINVAL;
 
-        retval = si470x_get_register(radio, STATUSRSSI);
-        if (retval < 0)
-                return retval;
+        if (!radio->status_rssi_auto_update) {
+                retval = si470x_get_register(radio, STATUSRSSI);
+                if (retval < 0)
+                        return retval;
+        }
 
         /* driver constants */
         strcpy(tuner->name, "FM");
@@ -599,25 +594,8 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
                             V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |
                             V4L2_TUNER_CAP_HWSEEK_BOUNDED |
                             V4L2_TUNER_CAP_HWSEEK_WRAP;
-
-        /* range limits */
-        switch ((radio->registers[SYSCONFIG2] & SYSCONFIG2_BAND) >> 6) {
-        /* 0: 87.5 - 108 MHz (USA, Europe, default) */
-        default:
-                tuner->rangelow  =  87.5 * FREQ_MUL;
-                tuner->rangehigh = 108   * FREQ_MUL;
-                break;
-        /* 1: 76   - 108 MHz (Japan wide band) */
-        case 1:
-                tuner->rangelow  =  76   * FREQ_MUL;
-                tuner->rangehigh = 108   * FREQ_MUL;
-                break;
-        /* 2: 76   -  90 MHz (Japan) */
-        case 2:
-                tuner->rangelow  =  76   * FREQ_MUL;
-                tuner->rangehigh =  90   * FREQ_MUL;
-                break;
-        };
+        tuner->rangelow  =  76 * FREQ_MUL;
+        tuner->rangehigh = 108 * FREQ_MUL;
 
         /* stereo indicator == stereo (instead of mono) */
         if ((radio->registers[STATUSRSSI] & STATUSRSSI_ST) == 0)
@@ -700,10 +678,18 @@ static int si470x_vidioc_s_frequency(struct file *file, void *priv,
                 struct v4l2_frequency *freq)
 {
         struct si470x_device *radio = video_drvdata(file);
+        int retval;
 
         if (freq->tuner != 0)
                 return -EINVAL;
 
+        if (freq->frequency < bands[radio->band].rangelow ||
+            freq->frequency > bands[radio->band].rangehigh) {
+                /* Switch to band 1 which covers everything we support */
+                retval = si470x_set_band(radio, 1);
+                if (retval)
+                        return retval;
+        }
         return si470x_set_freq(radio, freq->frequency);
 }
 
@@ -719,7 +705,21 @@ static int si470x_vidioc_s_hw_freq_seek(struct file *file, void *priv,
         if (seek->tuner != 0)
                 return -EINVAL;
 
-        return si470x_set_seek(radio, seek->wrap_around, seek->seek_upward);
+        return si470x_set_seek(radio, seek);
+}
+
+/*
+ * si470x_vidioc_enum_freq_bands - enumerate supported bands
+ */
+static int si470x_vidioc_enum_freq_bands(struct file *file, void *priv,
+                                         struct v4l2_frequency_band *band)
+{
+        if (band->tuner != 0)
+                return -EINVAL;
+        if (band->index >= ARRAY_SIZE(bands))
+                return -EINVAL;
+        *band = bands[band->index];
+        return 0;
 }
 
 const struct v4l2_ctrl_ops si470x_ctrl_ops = {
@@ -736,6 +736,7 @@ static const struct v4l2_ioctl_ops si470x_ioctl_ops = {
         .vidioc_g_frequency     = si470x_vidioc_g_frequency,
         .vidioc_s_frequency     = si470x_vidioc_s_frequency,
         .vidioc_s_hw_freq_seek  = si470x_vidioc_s_hw_freq_seek,
+        .vidioc_enum_freq_bands = si470x_vidioc_enum_freq_bands,
         .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
         .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
 };
diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c
index a80044c5874e..643a6ff7c5d0 100644
--- a/drivers/media/radio/si470x/radio-si470x-i2c.c
+++ b/drivers/media/radio/si470x/radio-si470x-i2c.c
@@ -350,7 +350,9 @@ static int __devinit si470x_i2c_probe(struct i2c_client *client,
         }
 
         radio->client = client;
+        radio->band = 1; /* Default to 76 - 108 MHz */
         mutex_init(&radio->lock);
+        init_completion(&radio->completion);
 
         /* video device initialization */
         radio->videodev = si470x_viddev_template;
@@ -406,10 +408,6 @@ static int __devinit si470x_i2c_probe(struct i2c_client *client,
         radio->rd_index = 0;
         init_waitqueue_head(&radio->read_queue);
 
-        /* mark Seek/Tune Complete Interrupt enabled */
-        radio->stci_enabled = true;
-        init_completion(&radio->completion);
-
         retval = request_threaded_irq(client->irq, NULL, si470x_i2c_interrupt,
                         IRQF_TRIGGER_FALLING, DRIVER_NAME, radio);
         if (retval) {
diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c
index f412f7ab270b..146be4263ea1 100644
--- a/drivers/media/radio/si470x/radio-si470x-usb.c
+++ b/drivers/media/radio/si470x/radio-si470x-usb.c
@@ -143,7 +143,7 @@ MODULE_PARM_DESC(max_rds_errors, "RDS maximum block errors: *1*");
  * Software/Hardware Versions from Scratch Page
  **************************************************************************/
 #define RADIO_SW_VERSION_NOT_BOOTLOADABLE       6
-#define RADIO_SW_VERSION                        7
+#define RADIO_SW_VERSION                        1
 #define RADIO_HW_VERSION                        1
 
 
@@ -399,12 +399,19 @@ static void si470x_int_in_callback(struct urb *urb)
                 }
         }
 
-        if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0)
+        /* Sometimes the device returns len 0 packets */
+        if (urb->actual_length != RDS_REPORT_SIZE)
                 goto resubmit;
 
-        if (urb->actual_length > 0) {
+        radio->registers[STATUSRSSI] =
+                get_unaligned_be16(&radio->int_in_buffer[1]);
+
+        if (radio->registers[STATUSRSSI] & STATUSRSSI_STC)
+                complete(&radio->completion);
+
+        if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS)) {
                 /* Update RDS registers with URB data */
-                for (regnr = 0; regnr < RDS_REGISTER_NUM; regnr++)
+                for (regnr = 1; regnr < RDS_REGISTER_NUM; regnr++)
                         radio->registers[STATUSRSSI + regnr] =
                             get_unaligned_be16(&radio->int_in_buffer[
                                 regnr * RADIO_REGISTER_SIZE + 1]);
@@ -480,6 +487,7 @@ resubmit:
                         radio->int_in_running = 0;
                 }
         }
+        radio->status_rssi_auto_update = radio->int_in_running;
 }
 
 
@@ -534,13 +542,6 @@ static int si470x_start_usb(struct si470x_device *radio)
 {
         int retval;
 
-        /* start radio */
-        retval = si470x_start(radio);
-        if (retval < 0)
-                return retval;
-
-        v4l2_ctrl_handler_setup(&radio->hdl);
-
         /* initialize interrupt urb */
         usb_fill_int_urb(radio->int_in_urb, radio->usbdev,
                         usb_rcvintpipe(radio->usbdev,
@@ -560,6 +561,15 @@ static int si470x_start_usb(struct si470x_device *radio)
                                 "submitting int urb failed (%d)\n", retval);
                 radio->int_in_running = 0;
         }
+        radio->status_rssi_auto_update = radio->int_in_running;
+
+        /* start radio */
+        retval = si470x_start(radio);
+        if (retval < 0)
+                return retval;
+
+        v4l2_ctrl_handler_setup(&radio->hdl);
+
         return retval;
 }
 
@@ -587,7 +597,9 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
         }
         radio->usbdev = interface_to_usbdev(intf);
         radio->intf = intf;
+        radio->band = 1; /* Default to 76 - 108 MHz */
         mutex_init(&radio->lock);
+        init_completion(&radio->completion);
 
         iface_desc = intf->cur_altsetting;
 
@@ -698,9 +710,6 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
                         "linux-media@vger.kernel.org\n");
         }
 
-        /* set initial frequency */
-        si470x_set_freq(radio, 87.5 * FREQ_MUL); /* available in all regions */
-
         /* set led to connect state */
         si470x_set_led_state(radio, BLINK_GREEN_LED);
 
@@ -723,6 +732,9 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
         if (retval < 0)
                 goto err_all;
 
+        /* set initial frequency */
+        si470x_set_freq(radio, 87.5 * FREQ_MUL); /* available in all regions */
+
         /* register video device */
         retval = video_register_device(&radio->videodev, VFL_TYPE_RADIO,
                         radio_nr);
@@ -781,11 +793,16 @@ static int si470x_usb_driver_suspend(struct usb_interface *intf,
 static int si470x_usb_driver_resume(struct usb_interface *intf)
 {
         struct si470x_device *radio = usb_get_intfdata(intf);
+        int ret;
 
         dev_info(&intf->dev, "resuming now...\n");
 
         /* start radio */
-        return si470x_start_usb(radio);
+        ret = si470x_start_usb(radio);
+        if (ret == 0)
+                v4l2_ctrl_handler_setup(&radio->hdl);
+
+        return ret;
 }
 
 
diff --git a/drivers/media/radio/si470x/radio-si470x.h b/drivers/media/radio/si470x/radio-si470x.h
index 4921cab8e0fa..2f089b4252df 100644
--- a/drivers/media/radio/si470x/radio-si470x.h
+++ b/drivers/media/radio/si470x/radio-si470x.h
@@ -87,7 +87,7 @@
 
 #define SYSCONFIG2              5       /* System Configuration 2 */
 #define SYSCONFIG2_SEEKTH       0xff00  /* bits 15..08: RSSI Seek Threshold */
-#define SYSCONFIG2_BAND         0x0080  /* bits 07..06: Band Select */
+#define SYSCONFIG2_BAND         0x00c0  /* bits 07..06: Band Select */
 #define SYSCONFIG2_SPACE        0x0030  /* bits 05..04: Channel Spacing */
 #define SYSCONFIG2_VOLUME       0x000f  /* bits 03..00: Volume */
 
@@ -147,6 +147,7 @@ struct si470x_device {
         struct v4l2_device v4l2_dev;
         struct video_device videodev;
         struct v4l2_ctrl_handler hdl;
+        int band;
 
         /* Silabs internal registers (0..15) */
         unsigned short registers[RADIO_REGISTER_NUM];
@@ -160,7 +161,7 @@ struct si470x_device {
         unsigned int wr_index;
 
         struct completion completion;
-        bool stci_enabled;              /* Seek/Tune Complete Interrupt */
+        bool status_rssi_auto_update;   /* Does RSSI get updated automatic? */
 
 #if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE)
         /* reference to USB and video device */
@@ -189,7 +190,7 @@ struct si470x_device {
  * Firmware Versions
  **************************************************************************/
 
-#define RADIO_FW_VERSION        15
+#define RADIO_FW_VERSION        12
 
 
 
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 908ef70430e9..5180390be7ab 100644
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -259,6 +259,17 @@ config IR_WINBOND_CIR
            To compile this driver as a module, choose M here: the module will
            be called winbond_cir.
 
+config IR_IGUANA
+        tristate "IguanaWorks USB IR Transceiver"
+        depends on RC_CORE
+        select USB
+        ---help---
+           Say Y here if you want to use the IgaunaWorks USB IR Transceiver.
+           Both infrared receive and send are supported.
+
+           To compile this driver as a module, choose M here: the module will
+           be called iguanair.
+
 config RC_LOOPBACK
         tristate "Remote Control Loopback Driver"
         depends on RC_CORE
diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 29f364f88a94..f871d1986c21 100644
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -27,3 +27,4 @@ obj-$(CONFIG_IR_STREAMZAP) += streamzap.o
 obj-$(CONFIG_IR_WINBOND_CIR) += winbond-cir.o
 obj-$(CONFIG_RC_LOOPBACK) += rc-loopback.o
 obj-$(CONFIG_IR_GPIO_CIR) += gpio-ir-recv.o
+obj-$(CONFIG_IR_IGUANA) += iguanair.o
diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c
index 7be377fc1be8..8fa72e2dacb1 100644
--- a/drivers/media/rc/ati_remote.c
+++ b/drivers/media/rc/ati_remote.c
@@ -147,7 +147,8 @@ static bool mouse = true;
 module_param(mouse, bool, 0444);
 MODULE_PARM_DESC(mouse, "Enable mouse device, default = yes");
 
-#define dbginfo(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0)
+#define dbginfo(dev, format, arg...) \
+        do { if (debug) dev_info(dev , format , ## arg); } while (0)
 #undef err
 #define err(format, arg...) printk(KERN_ERR format , ## arg)
 
@@ -191,17 +192,41 @@ static const char *get_medion_keymap(struct usb_interface *interface)
         return RC_MAP_MEDION_X10;
 }
 
-static const struct ati_receiver_type type_ati          = { .default_keymap = RC_MAP_ATI_X10 };
-static const struct ati_receiver_type type_medion       = { .get_default_keymap = get_medion_keymap };
-static const struct ati_receiver_type type_firefly      = { .default_keymap = RC_MAP_SNAPSTREAM_FIREFLY };
+static const struct ati_receiver_type type_ati          = {
+        .default_keymap = RC_MAP_ATI_X10
+};
+static const struct ati_receiver_type type_medion       = {
+        .get_default_keymap = get_medion_keymap
+};
+static const struct ati_receiver_type type_firefly      = {
+        .default_keymap = RC_MAP_SNAPSTREAM_FIREFLY
+};
 
 static struct usb_device_id ati_remote_table[] = {
-        { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA_REMOTE_PRODUCT_ID),     .driver_info = (unsigned long)&type_ati },
-        { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA2_REMOTE_PRODUCT_ID),    .driver_info = (unsigned long)&type_ati },
-        { USB_DEVICE(ATI_REMOTE_VENDOR_ID, ATI_REMOTE_PRODUCT_ID),      .driver_info = (unsigned long)&type_ati },
-        { USB_DEVICE(ATI_REMOTE_VENDOR_ID, NVIDIA_REMOTE_PRODUCT_ID),   .driver_info = (unsigned long)&type_ati },
-        { USB_DEVICE(ATI_REMOTE_VENDOR_ID, MEDION_REMOTE_PRODUCT_ID),   .driver_info = (unsigned long)&type_medion },
-        { USB_DEVICE(ATI_REMOTE_VENDOR_ID, FIREFLY_REMOTE_PRODUCT_ID),  .driver_info = (unsigned long)&type_firefly },
+        {
+                USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA_REMOTE_PRODUCT_ID),
+                .driver_info = (unsigned long)&type_ati
+        },
+        {
+                USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA2_REMOTE_PRODUCT_ID),
+                .driver_info = (unsigned long)&type_ati
+        },
+        {
+                USB_DEVICE(ATI_REMOTE_VENDOR_ID, ATI_REMOTE_PRODUCT_ID),
+                .driver_info = (unsigned long)&type_ati
+        },
+        {
+                USB_DEVICE(ATI_REMOTE_VENDOR_ID, NVIDIA_REMOTE_PRODUCT_ID),
+                .driver_info = (unsigned long)&type_ati
+        },
+        {
+                USB_DEVICE(ATI_REMOTE_VENDOR_ID, MEDION_REMOTE_PRODUCT_ID),
+                .driver_info = (unsigned long)&type_medion
+        },
+        {
+                USB_DEVICE(ATI_REMOTE_VENDOR_ID, FIREFLY_REMOTE_PRODUCT_ID),
+                .driver_info = (unsigned long)&type_firefly
+        },
         {}      /* Terminating entry */
 };
 
@@ -296,25 +321,8 @@ static const struct {
         {KIND_END, 0x00, EV_MAX + 1, 0, 0}
 };
 
-/* Local function prototypes */
-static int ati_remote_sendpacket        (struct ati_remote *ati_remote, u16 cmd, unsigned char *data);
-static void ati_remote_irq_out          (struct urb *urb);
-static void ati_remote_irq_in           (struct urb *urb);
-static void ati_remote_input_report     (struct urb *urb);
-static int ati_remote_initialize        (struct ati_remote *ati_remote);
-static int ati_remote_probe             (struct usb_interface *interface, const struct usb_device_id *id);
-static void ati_remote_disconnect       (struct usb_interface *interface);
-
-/* usb specific object to register with the usb subsystem */
-static struct usb_driver ati_remote_driver = {
-        .name         = "ati_remote",
-        .probe        = ati_remote_probe,
-        .disconnect   = ati_remote_disconnect,
-        .id_table     = ati_remote_table,
-};
-
 /*
- *      ati_remote_dump_input
+ * ati_remote_dump_input
  */
 static void ati_remote_dump(struct device *dev, unsigned char *data,
                             unsigned int len)
@@ -326,12 +334,14 @@ static void ati_remote_dump(struct device *dev, unsigned char *data,
                 dev_warn(dev, "Weird key %02x %02x %02x %02x\n",
                      data[0], data[1], data[2], data[3]);
         else
-                dev_warn(dev, "Weird data, len=%d %02x %02x %02x %02x %02x %02x ...\n",
-                     len, data[0], data[1], data[2], data[3], data[4], data[5]);
+                dev_warn(dev,
+                        "Weird data, len=%d %02x %02x %02x %02x %02x %02x ...\n",
+                        len, data[0], data[1], data[2], data[3], data[4],
+                        data[5]);
 }
 
 /*
- *      ati_remote_open
+ * ati_remote_open
  */
 static int ati_remote_open(struct ati_remote *ati_remote)
 {
@@ -355,7 +365,7 @@ out:	mutex_unlock(&ati_remote->open_mutex);
 }
 
 /*
- *      ati_remote_close
+ * ati_remote_close
  */
 static void ati_remote_close(struct ati_remote *ati_remote)
 {
@@ -390,7 +400,7 @@ static void ati_remote_rc_close(struct rc_dev *rdev)
 }
 
 /*
- *              ati_remote_irq_out
+ * ati_remote_irq_out
  */
 static void ati_remote_irq_out(struct urb *urb)
 {
@@ -408,11 +418,12 @@ static void ati_remote_irq_out(struct urb *urb)
 }
 
 /*
- *      ati_remote_sendpacket
+ * ati_remote_sendpacket
  *
- *      Used to send device initialization strings
+ * Used to send device initialization strings
  */
-static int ati_remote_sendpacket(struct ati_remote *ati_remote, u16 cmd, unsigned char *data)
+static int ati_remote_sendpacket(struct ati_remote *ati_remote, u16 cmd,
+        unsigned char *data)
 {
         int retval = 0;
 
@@ -441,7 +452,7 @@ static int ati_remote_sendpacket(struct ati_remote *ati_remote, u16 cmd, unsigne
 }
 
 /*
- *      ati_remote_compute_accel
+ * ati_remote_compute_accel
  *
  * Implements acceleration curve for directional control pad
  * If elapsed time since last event is > 1/4 second, user "stopped",
@@ -478,7 +489,7 @@ static int ati_remote_compute_accel(struct ati_remote *ati_remote)
 }
 
 /*
- *      ati_remote_report_input
+ * ati_remote_report_input
  */
 static void ati_remote_input_report(struct urb *urb)
 {
@@ -518,7 +529,8 @@ static void ati_remote_input_report(struct urb *urb)
         remote_num = (data[3] >> 4) & 0x0f;
         if (channel_mask & (1 << (remote_num + 1))) {
                 dbginfo(&ati_remote->interface->dev,
-                        "Masked input from channel 0x%02x: data %02x,%02x, mask= 0x%02lx\n",
+                        "Masked input from channel 0x%02x: data %02x,%02x, "
+                        "mask= 0x%02lx\n",
                         remote_num, data[1], data[2], channel_mask);
                 return;
         }
@@ -546,7 +558,9 @@ static void ati_remote_input_report(struct urb *urb)
                 if (wheel_keycode == KEY_RESERVED) {
                         /* scrollwheel was not mapped, assume mouse */
 
-                        /* Look up event code index in the mouse translation table. */
+                        /* Look up event code index in the mouse translation
+                         * table.
+                         */
                         for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++) {
                                 if (scancode == ati_remote_tbl[i].data) {
                                         index = i;
@@ -630,9 +644,9 @@ static void ati_remote_input_report(struct urb *urb)
         } else {
 
                 /*
-                 * Other event kinds are from the directional control pad, and have an
-                 * acceleration factor applied to them.  Without this acceleration, the
-                 * control pad is mostly unusable.
+                 * Other event kinds are from the directional control pad, and
+                 * have an acceleration factor applied to them.  Without this
+                 * acceleration, the control pad is mostly unusable.
                  */
                 acc = ati_remote_compute_accel(ati_remote);
 
@@ -659,7 +673,8 @@ static void ati_remote_input_report(struct urb *urb)
                         input_report_rel(dev, REL_Y, acc);
                         break;
                 default:
-                        dev_dbg(&ati_remote->interface->dev, "ati_remote kind=%d\n",
+                        dev_dbg(&ati_remote->interface->dev,
+                                "ati_remote kind=%d\n",
                                 ati_remote_tbl[index].kind);
                 }
                 input_sync(dev);
@@ -670,7 +685,7 @@ static void ati_remote_input_report(struct urb *urb)
 }
 
 /*
- *      ati_remote_irq_in
+ * ati_remote_irq_in
  */
 static void ati_remote_irq_in(struct urb *urb)
 {
@@ -684,22 +699,25 @@ static void ati_remote_irq_in(struct urb *urb)
         case -ECONNRESET:       /* unlink */
         case -ENOENT:
         case -ESHUTDOWN:
-                dev_dbg(&ati_remote->interface->dev, "%s: urb error status, unlink? \n",
+                dev_dbg(&ati_remote->interface->dev,
+                        "%s: urb error status, unlink?\n",
                         __func__);
                 return;
         default:                /* error */
-                dev_dbg(&ati_remote->interface->dev, "%s: Nonzero urb status %d\n",
+                dev_dbg(&ati_remote->interface->dev,
+                        "%s: Nonzero urb status %d\n",
                         __func__, urb->status);
         }
 
         retval = usb_submit_urb(urb, GFP_ATOMIC);
         if (retval)
-                dev_err(&ati_remote->interface->dev, "%s: usb_submit_urb()=%d\n",
+                dev_err(&ati_remote->interface->dev,
+                        "%s: usb_submit_urb()=%d\n",
                         __func__, retval);
 }
 
 /*
- *      ati_remote_alloc_buffers
+ * ati_remote_alloc_buffers
  */
 static int ati_remote_alloc_buffers(struct usb_device *udev,
                                     struct ati_remote *ati_remote)
@@ -726,7 +744,7 @@ static int ati_remote_alloc_buffers(struct usb_device *udev,
 }
 
 /*
- *      ati_remote_free_buffers
+ * ati_remote_free_buffers
  */
 static void ati_remote_free_buffers(struct ati_remote *ati_remote)
 {
@@ -825,9 +843,10 @@ static int ati_remote_initialize(struct ati_remote *ati_remote)
 }
 
 /*
- *      ati_remote_probe
+ * ati_remote_probe
  */
-static int ati_remote_probe(struct usb_interface *interface, const struct usb_device_id *id)
+static int ati_remote_probe(struct usb_interface *interface,
+        const struct usb_device_id *id)
 {
         struct usb_device *udev = interface_to_usbdev(interface);
         struct usb_host_interface *iface_host = interface->cur_altsetting;
@@ -949,7 +968,7 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de
 }
 
 /*
- *      ati_remote_disconnect
+ * ati_remote_disconnect
  */
 static void ati_remote_disconnect(struct usb_interface *interface)
 {
@@ -971,6 +990,14 @@ static void ati_remote_disconnect(struct usb_interface *interface)
         kfree(ati_remote);
 }
 
+/* usb specific object to register with the usb subsystem */
+static struct usb_driver ati_remote_driver = {
+        .name         = "ati_remote",
+        .probe        = ati_remote_probe,
+        .disconnect   = ati_remote_disconnect,
+        .id_table     = ati_remote_table,
+};
+
 module_usb_driver(ati_remote_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
diff --git a/drivers/media/rc/iguanair.c b/drivers/media/rc/iguanair.c
new file mode 100644
index 000000000000..5e2eaf8ba73e
--- /dev/null
+++ b/drivers/media/rc/iguanair.c
@@ -0,0 +1,639 @@
+/*
+ * IguanaWorks USB IR Transceiver support
+ *
+ * Copyright (C) 2012 Sean Young <sean@mess.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+#include <linux/usb/input.h>
+#include <linux/slab.h>
+#include <linux/completion.h>
+#include <media/rc-core.h>
+
+#define DRIVER_NAME "iguanair"
+
+struct iguanair {
+        struct rc_dev *rc;
+
+        struct device *dev;
+        struct usb_device *udev;
+
+        int pipe_in, pipe_out;
+        uint8_t bufsize;
+        uint8_t version[2];
+
+        struct mutex lock;
+
+        /* receiver support */
+        bool receiver_on;
+        dma_addr_t dma_in;
+        uint8_t *buf_in;
+        struct urb *urb_in;
+        struct completion completion;
+
+        /* transmit support */
+        bool tx_overflow;
+        uint32_t carrier;
+        uint8_t cycle_overhead;
+        uint8_t channels;
+        uint8_t busy4;
+        uint8_t busy7;
+
+        char name[64];
+        char phys[64];
+};
+
+#define CMD_GET_VERSION         0x01
+#define CMD_GET_BUFSIZE         0x11
+#define CMD_GET_FEATURES        0x10
+#define CMD_SEND                0x15
+#define CMD_EXECUTE             0x1f
+#define CMD_RX_OVERFLOW         0x31
+#define CMD_TX_OVERFLOW         0x32
+#define CMD_RECEIVER_ON         0x12
+#define CMD_RECEIVER_OFF        0x14
+
+#define DIR_IN                  0xdc
+#define DIR_OUT                 0xcd
+
+#define MAX_PACKET_SIZE         8u
+#define TIMEOUT                 1000
+
+struct packet {
+        uint16_t start;
+        uint8_t direction;
+        uint8_t cmd;
+};
+
+struct response_packet {
+        struct packet header;
+        uint8_t data[4];
+};
+
+struct send_packet {
+        struct packet header;
+        uint8_t length;
+        uint8_t channels;
+        uint8_t busy7;
+        uint8_t busy4;
+        uint8_t payload[0];
+};
+
+static void process_ir_data(struct iguanair *ir, unsigned len)
+{
+        if (len >= 4 && ir->buf_in[0] == 0 && ir->buf_in[1] == 0) {
+                switch (ir->buf_in[3]) {
+                case CMD_TX_OVERFLOW:
+                        ir->tx_overflow = true;
+                case CMD_RECEIVER_OFF:
+                case CMD_RECEIVER_ON:
+                case CMD_SEND:
+                        complete(&ir->completion);
+                        break;
+                case CMD_RX_OVERFLOW:
+                        dev_warn(ir->dev, "receive overflow\n");
+                        break;
+                default:
+                        dev_warn(ir->dev, "control code %02x received\n",
+                                                        ir->buf_in[3]);
+                        break;
+                }
+        } else if (len >= 7) {
+                DEFINE_IR_RAW_EVENT(rawir);
+                unsigned i;
+
+                init_ir_raw_event(&rawir);
+
+                for (i = 0; i < 7; i++) {
+                        if (ir->buf_in[i] == 0x80) {
+                                rawir.pulse = false;
+                                rawir.duration = US_TO_NS(21845);
+                        } else {
+                                rawir.pulse = (ir->buf_in[i] & 0x80) == 0;
+                                rawir.duration = ((ir->buf_in[i] & 0x7f) + 1) *
+                                                                         21330;
+                        }
+
+                        ir_raw_event_store_with_filter(ir->rc, &rawir);
+                }
+
+                ir_raw_event_handle(ir->rc);
+        }
+}
+
+static void iguanair_rx(struct urb *urb)
+{
+        struct iguanair *ir;
+
+        if (!urb)
+                return;
+
+        ir = urb->context;
+        if (!ir) {
+                usb_unlink_urb(urb);
+                return;
+        }
+
+        switch (urb->status) {
+        case 0:
+                process_ir_data(ir, urb->actual_length);
+                break;
+        case -ECONNRESET:
+        case -ENOENT:
+        case -ESHUTDOWN:
+                usb_unlink_urb(urb);
+                return;
+        case -EPIPE:
+        default:
+                dev_dbg(ir->dev, "Error: urb status = %d\n", urb->status);
+                break;
+        }
+
+        usb_submit_urb(urb, GFP_ATOMIC);
+}
+
+static int iguanair_send(struct iguanair *ir, void *data, unsigned size,
+                        struct response_packet *response, unsigned *res_len)
+{
+        unsigned offset, len;
+        int rc, transferred;
+
+        for (offset = 0; offset < size; offset += MAX_PACKET_SIZE) {
+                len = min(size - offset, MAX_PACKET_SIZE);
+
+                if (ir->tx_overflow)
+                        return -EOVERFLOW;
+
+                rc = usb_interrupt_msg(ir->udev, ir->pipe_out, data + offset,
+                                                len, &transferred, TIMEOUT);
+                if (rc)
+                        return rc;
+
+                if (transferred != len)
+                        return -EIO;
+        }
+
+        if (response) {
+                rc = usb_interrupt_msg(ir->udev, ir->pipe_in, response,
+                                        sizeof(*response), res_len, TIMEOUT);
+        }
+
+        return rc;
+}
+
+static int iguanair_get_features(struct iguanair *ir)
+{
+        struct packet packet;
+        struct response_packet response;
+        int rc, len;
+
+        packet.start = 0;
+        packet.direction = DIR_OUT;
+        packet.cmd = CMD_GET_VERSION;
+
+        rc = iguanair_send(ir, &packet, sizeof(packet), &response, &len);
+        if (rc) {
+                dev_info(ir->dev, "failed to get version\n");
+                goto out;
+        }
+
+        if (len != 6) {
+                dev_info(ir->dev, "failed to get version\n");
+                rc = -EIO;
+                goto out;
+        }
+
+        ir->version[0] = response.data[0];
+        ir->version[1] = response.data[1];
+        ir->bufsize = 150;
+        ir->cycle_overhead = 65;
+
+        packet.cmd = CMD_GET_BUFSIZE;
+
+        rc = iguanair_send(ir, &packet, sizeof(packet), &response, &len);
+        if (rc) {
+                dev_info(ir->dev, "failed to get buffer size\n");
+                goto out;
+        }
+
+        if (len != 5) {
+                dev_info(ir->dev, "failed to get buffer size\n");
+                rc = -EIO;
+                goto out;
+        }
+
+        ir->bufsize = response.data[0];
+
+        if (ir->version[0] == 0 || ir->version[1] == 0)
+                goto out;
+
+        packet.cmd = CMD_GET_FEATURES;
+
+        rc = iguanair_send(ir, &packet, sizeof(packet), &response, &len);
+        if (rc) {
+                dev_info(ir->dev, "failed to get features\n");
+                goto out;
+        }
+
+        if (len < 5) {
+                dev_info(ir->dev, "failed to get features\n");
+                rc = -EIO;
+                goto out;
+        }
+
+        if (len > 5 && ir->version[0] >= 4)
+                ir->cycle_overhead = response.data[1];
+
+out:
+        return rc;
+}
+
+static int iguanair_receiver(struct iguanair *ir, bool enable)
+{
+        struct packet packet = { 0, DIR_OUT, enable ?
+                                CMD_RECEIVER_ON : CMD_RECEIVER_OFF };
+        int rc;
+
+        INIT_COMPLETION(ir->completion);
+
+        rc = iguanair_send(ir, &packet, sizeof(packet), NULL, NULL);
+        if (rc)
+                return rc;
+
+        wait_for_completion_timeout(&ir->completion, TIMEOUT);
+
+        return 0;
+}
+
+/*
+ * The iguana ir creates the carrier by busy spinning after each pulse or
+ * space. This is counted in CPU cycles, with the CPU running at 24MHz. It is
+ * broken down into 7-cycles and 4-cyles delays, with a preference for
+ * 4-cycle delays.
+ */
+static int iguanair_set_tx_carrier(struct rc_dev *dev, uint32_t carrier)
+{
+        struct iguanair *ir = dev->priv;
+
+        if (carrier < 25000 || carrier > 150000)
+                return -EINVAL;
+
+        mutex_lock(&ir->lock);
+
+        if (carrier != ir->carrier) {
+                uint32_t cycles, fours, sevens;
+
+                ir->carrier = carrier;
+
+                cycles = DIV_ROUND_CLOSEST(24000000, carrier * 2) -
+                                                        ir->cycle_overhead;
+
+                /*  make up the the remainer of 4-cycle blocks */
+                switch (cycles & 3) {
+                case 0:
+                        sevens = 0;
+                        break;
+                case 1:
+                        sevens = 3;
+                        break;
+                case 2:
+                        sevens = 2;
+                        break;
+                case 3:
+                        sevens = 1;
+                        break;
+                }
+
+                fours = (cycles - sevens * 7) / 4;
+
+                /* magic happens here */
+                ir->busy7 = (4 - sevens) * 2;
+                ir->busy4 = 110 - fours;
+        }
+
+        mutex_unlock(&ir->lock);
+
+        return carrier;
+}
+
+static int iguanair_set_tx_mask(struct rc_dev *dev, uint32_t mask)
+{
+        struct iguanair *ir = dev->priv;
+
+        if (mask > 15)
+                return 4;
+
+        mutex_lock(&ir->lock);
+        ir->channels = mask;
+        mutex_unlock(&ir->lock);
+
+        return 0;
+}
+
+static int iguanair_tx(struct rc_dev *dev, unsigned *txbuf, unsigned count)
+{
+        struct iguanair *ir = dev->priv;
+        uint8_t space, *payload;
+        unsigned i, size, rc;
+        struct send_packet *packet;
+
+        mutex_lock(&ir->lock);
+
+        /* convert from us to carrier periods */
+        for (i = size = 0; i < count; i++) {
+                txbuf[i] = DIV_ROUND_CLOSEST(txbuf[i] * ir->carrier, 1000000);
+                size += (txbuf[i] + 126) / 127;
+        }
+
+        packet = kmalloc(sizeof(*packet) + size, GFP_KERNEL);
+        if (!packet) {
+                rc = -ENOMEM;
+                goto out;
+        }
+
+        if (size > ir->bufsize) {
+                rc = -E2BIG;
+                goto out;
+        }
+
+        packet->header.start = 0;
+        packet->header.direction = DIR_OUT;
+        packet->header.cmd = CMD_SEND;
+        packet->length = size;
+        packet->channels = ir->channels << 4;
+        packet->busy7 = ir->busy7;
+        packet->busy4 = ir->busy4;
+
+        space = 0;
+        payload = packet->payload;
+
+        for (i = 0; i < count; i++) {
+                unsigned periods = txbuf[i];
+
+                while (periods > 127) {
+                        *payload++ = 127 | space;
+                        periods -= 127;
+                }
+
+                *payload++ = periods | space;
+                space ^= 0x80;
+        }
+
+        if (ir->receiver_on) {
+                rc = iguanair_receiver(ir, false);
+                if (rc) {
+                        dev_warn(ir->dev, "disable receiver before transmit failed\n");
+                        goto out;
+                }
+        }
+
+        ir->tx_overflow = false;
+
+        INIT_COMPLETION(ir->completion);
+
+        rc = iguanair_send(ir, packet, size + 8, NULL, NULL);
+
+        if (rc == 0) {
+                wait_for_completion_timeout(&ir->completion, TIMEOUT);
+                if (ir->tx_overflow)
+                        rc = -EOVERFLOW;
+        }
+
+        ir->tx_overflow = false;
+
+        if (ir->receiver_on) {
+                if (iguanair_receiver(ir, true))
+                        dev_warn(ir->dev, "re-enable receiver after transmit failed\n");
+        }
+
+out:
+        mutex_unlock(&ir->lock);
+        kfree(packet);
+
+        return rc;
+}
+
+static int iguanair_open(struct rc_dev *rdev)
+{
+        struct iguanair *ir = rdev->priv;
+        int rc;
+
+        mutex_lock(&ir->lock);
+
+        usb_submit_urb(ir->urb_in, GFP_KERNEL);
+
+        BUG_ON(ir->receiver_on);
+
+        rc = iguanair_receiver(ir, true);
+        if (rc == 0)
+                ir->receiver_on = true;
+
+        mutex_unlock(&ir->lock);
+
+        return rc;
+}
+
+static void iguanair_close(struct rc_dev *rdev)
+{
+        struct iguanair *ir = rdev->priv;
+        int rc;
+
+        mutex_lock(&ir->lock);
+
+        rc = iguanair_receiver(ir, false);
+        ir->receiver_on = false;
+        if (rc)
+                dev_warn(ir->dev, "failed to disable receiver: %d\n", rc);
+
+        usb_kill_urb(ir->urb_in);
+
+        mutex_unlock(&ir->lock);
+}
+
+static int __devinit iguanair_probe(struct usb_interface *intf,
+                                                const struct usb_device_id *id)
+{
+        struct usb_device *udev = interface_to_usbdev(intf);
+        struct iguanair *ir;
+        struct rc_dev *rc;
+        int ret;
+        struct usb_host_interface *idesc;
+
+        ir = kzalloc(sizeof(*ir), GFP_KERNEL);
+        rc = rc_allocate_device();
+        if (!ir || !rc) {
+                ret = ENOMEM;
+                goto out;
+        }
+
+        ir->buf_in = usb_alloc_coherent(udev, MAX_PACKET_SIZE, GFP_ATOMIC,
+                                                                &ir->dma_in);
+        ir->urb_in = usb_alloc_urb(0, GFP_KERNEL);
+
+        if (!ir->buf_in || !ir->urb_in) {
+                ret = ENOMEM;
+                goto out;
+        }
+
+        idesc = intf->altsetting;
+
+        if (idesc->desc.bNumEndpoints < 2) {
+                ret = -ENODEV;
+                goto out;
+        }
+
+        ir->rc = rc;
+        ir->dev = &intf->dev;
+        ir->udev = udev;
+        ir->pipe_in = usb_rcvintpipe(udev,
+                                idesc->endpoint[0].desc.bEndpointAddress);
+        ir->pipe_out = usb_sndintpipe(udev,
+                                idesc->endpoint[1].desc.bEndpointAddress);
+        mutex_init(&ir->lock);
+        init_completion(&ir->completion);
+
+        ret = iguanair_get_features(ir);
+        if (ret) {
+                dev_warn(&intf->dev, "failed to get device features");
+                goto out;
+        }
+
+        usb_fill_int_urb(ir->urb_in, ir->udev, ir->pipe_in, ir->buf_in,
+                MAX_PACKET_SIZE, iguanair_rx, ir,
+                idesc->endpoint[0].desc.bInterval);
+        ir->urb_in->transfer_dma = ir->dma_in;
+        ir->urb_in->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+
+        snprintf(ir->name, sizeof(ir->name),
+                "IguanaWorks USB IR Transceiver version %d.%d",
+                ir->version[0], ir->version[1]);
+
+        usb_make_path(ir->udev, ir->phys, sizeof(ir->phys));
+
+        rc->input_name = ir->name;
+        rc->input_phys = ir->phys;
+        usb_to_input_id(ir->udev, &rc->input_id);
+        rc->dev.parent = &intf->dev;
+        rc->driver_type = RC_DRIVER_IR_RAW;
+        rc->allowed_protos = RC_TYPE_ALL;
+        rc->priv = ir;
+        rc->open = iguanair_open;
+        rc->close = iguanair_close;
+        rc->s_tx_mask = iguanair_set_tx_mask;
+        rc->s_tx_carrier = iguanair_set_tx_carrier;
+        rc->tx_ir = iguanair_tx;
+        rc->driver_name = DRIVER_NAME;
+        rc->map_name = RC_MAP_EMPTY;
+
+        iguanair_set_tx_carrier(rc, 38000);
+
+        ret = rc_register_device(rc);
+        if (ret < 0) {
+                dev_err(&intf->dev, "failed to register rc device %d", ret);
+                goto out;
+        }
+
+        usb_set_intfdata(intf, ir);
+
+        dev_info(&intf->dev, "Registered %s", ir->name);
+
+        return 0;
+out:
+        if (ir) {
+                usb_free_urb(ir->urb_in);
+                usb_free_coherent(udev, MAX_PACKET_SIZE, ir->buf_in,
+                                                                ir->dma_in);
+        }
+        rc_free_device(rc);
+        kfree(ir);
+        return ret;
+}
+
+static void __devexit iguanair_disconnect(struct usb_interface *intf)
+{
+        struct iguanair *ir = usb_get_intfdata(intf);
+
+        usb_set_intfdata(intf, NULL);
+
+        usb_kill_urb(ir->urb_in);
+        usb_free_urb(ir->urb_in);
+        usb_free_coherent(ir->udev, MAX_PACKET_SIZE, ir->buf_in, ir->dma_in);
+        rc_unregister_device(ir->rc);
+        kfree(ir);
+}
+
+static int iguanair_suspend(struct usb_interface *intf, pm_message_t message)
+{
+        struct iguanair *ir = usb_get_intfdata(intf);
+        int rc = 0;
+
+        mutex_lock(&ir->lock);
+
+        if (ir->receiver_on) {
+                rc = iguanair_receiver(ir, false);
+                if (rc)
+                        dev_warn(ir->dev, "failed to disable receiver for suspend\n");
+        }
+
+        mutex_unlock(&ir->lock);
+
+        return rc;
+}
+
+static int iguanair_resume(struct usb_interface *intf)
+{
+        struct iguanair *ir = usb_get_intfdata(intf);
+        int rc = 0;
+
+        mutex_lock(&ir->lock);
+
+        if (ir->receiver_on) {
+                rc = iguanair_receiver(ir, true);
+                if (rc)
+                        dev_warn(ir->dev, "failed to enable receiver after resume\n");
+        }
+
+        mutex_unlock(&ir->lock);
+
+        return rc;
+}
+
+static const struct usb_device_id iguanair_table[] = {
+        { USB_DEVICE(0x1781, 0x0938) },
+        { }
+};
+
+static struct usb_driver iguanair_driver = {
+        .name = DRIVER_NAME,
+        .probe = iguanair_probe,
+        .disconnect = __devexit_p(iguanair_disconnect),
+        .suspend = iguanair_suspend,
+        .resume = iguanair_resume,
+        .reset_resume = iguanair_resume,
+        .id_table = iguanair_table
+};
+
+module_usb_driver(iguanair_driver);
+
+MODULE_DESCRIPTION("IguanaWorks USB IR Transceiver");
+MODULE_AUTHOR("Sean Young <sean@mess.org>");
+MODULE_LICENSE("GPL");
+MODULE_DEVICE_TABLE(usb, iguanair_table);
+
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index 84e06d3aa696..f38d9a8c6880 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -199,6 +199,7 @@ static bool debug;
 #define VENDOR_REALTEK          0x0bda
 #define VENDOR_TIVO             0x105a
 #define VENDOR_CONEXANT         0x0572
+#define VENDOR_TWISTEDMELON     0x2596
 
 enum mceusb_model_type {
         MCE_GEN2 = 0,           /* Most boards */
@@ -391,6 +392,12 @@ static struct usb_device_id mceusb_dev_table[] = {
         /* Conexant Hybrid TV RDU253S Polaris */
         { USB_DEVICE(VENDOR_CONEXANT, 0x58a5),
           .driver_info = CX_HYBRID_TV },
+        /* Twisted Melon Inc. - Manta Mini Receiver */
+        { USB_DEVICE(VENDOR_TWISTEDMELON, 0x8008) },
+        /* Twisted Melon Inc. - Manta Pico Receiver */
+        { USB_DEVICE(VENDOR_TWISTEDMELON, 0x8016) },
+        /* Twisted Melon Inc. - Manta Transceiver */
+        { USB_DEVICE(VENDOR_TWISTEDMELON, 0x8042) },
         /* Terminating entry */
         { }
 };
@@ -410,14 +417,12 @@ struct mceusb_dev {
         /* usb */
         struct usb_device *usbdev;
         struct urb *urb_in;
-        struct usb_endpoint_descriptor *usb_ep_in;
         struct usb_endpoint_descriptor *usb_ep_out;
 
         /* buffers and dma */
         unsigned char *buf_in;
         unsigned int len_in;
         dma_addr_t dma_in;
-        dma_addr_t dma_out;
 
         enum {
                 CMD_HEADER = 0,
@@ -686,7 +691,7 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf,
                 dev_info(dev, "Raw IR data, %d pulse/space samples\n", ir->rem);
 }
 
-static void mce_async_callback(struct urb *urb, struct pt_regs *regs)
+static void mce_async_callback(struct urb *urb)
 {
         struct mceusb_dev *ir;
         int len;
@@ -733,7 +738,7 @@ static void mce_request_packet(struct mceusb_dev *ir, unsigned char *data,
                 pipe = usb_sndintpipe(ir->usbdev,
                                       ir->usb_ep_out->bEndpointAddress);
                 usb_fill_int_urb(async_urb, ir->usbdev, pipe,
-                        async_buf, size, (usb_complete_t)mce_async_callback,
+                        async_buf, size, mce_async_callback,
                         ir, ir->usb_ep_out->bInterval);
                 memcpy(async_buf, data, size);
 
@@ -1031,7 +1036,7 @@ static void mceusb_process_ir_data(struct mceusb_dev *ir, int buf_len)
         ir_raw_event_handle(ir->rc);
 }
 
-static void mceusb_dev_recv(struct urb *urb, struct pt_regs *regs)
+static void mceusb_dev_recv(struct urb *urb)
 {
         struct mceusb_dev *ir;
         int buf_len;
@@ -1331,7 +1336,6 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf,
         ir->model = model;
 
         /* Saving usb interface data for use by the transmitter routine */
-        ir->usb_ep_in = ep_in;
         ir->usb_ep_out = ep_out;
 
         if (dev->descriptor.iManufacturer
@@ -1349,8 +1353,8 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf,
                 goto rc_dev_fail;
 
         /* wire up inbound data handler */
-        usb_fill_int_urb(ir->urb_in, dev, pipe, ir->buf_in,
-                maxp, (usb_complete_t) mceusb_dev_recv, ir, ep_in->bInterval);
+        usb_fill_int_urb(ir->urb_in, dev, pipe, ir->buf_in, maxp,
+                                mceusb_dev_recv, ir, ep_in->bInterval);
         ir->urb_in->transfer_dma = ir->dma_in;
         ir->urb_in->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 6e16b09c24a9..cabc19c10515 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -775,10 +775,11 @@ static ssize_t show_protocols(struct device *device,
         if (dev->driver_type == RC_DRIVER_SCANCODE) {
                 enabled = dev->rc_map.rc_type;
                 allowed = dev->allowed_protos;
-        } else {
+        } else if (dev->raw) {
                 enabled = dev->raw->enabled_protocols;
                 allowed = ir_raw_get_allowed_protocols();
-        }
+        } else
+                return -ENODEV;
 
         IR_dprintk(1, "allowed - 0x%llx, enabled - 0x%llx\n",
                    (long long)allowed,
diff --git a/drivers/media/video/adv7180.c b/drivers/media/video/adv7180.c
index 174bffacf117..45ecf8db1eae 100644
--- a/drivers/media/video/adv7180.c
+++ b/drivers/media/video/adv7180.c
@@ -26,11 +26,10 @@
 #include <media/v4l2-ioctl.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
+#include <media/v4l2-ctrls.h>
 #include <media/v4l2-chip-ident.h>
 #include <linux/mutex.h>
 
-#define DRIVER_NAME "adv7180"
-
 #define ADV7180_INPUT_CONTROL_REG                       0x00
 #define ADV7180_INPUT_CONTROL_AD_PAL_BG_NTSC_J_SECAM    0x00
 #define ADV7180_INPUT_CONTROL_AD_PAL_BG_NTSC_J_SECAM_PED 0x10
@@ -55,21 +54,21 @@
 
 #define ADV7180_AUTODETECT_ENABLE_REG                   0x07
 #define ADV7180_AUTODETECT_DEFAULT                      0x7f
-
+/* Contrast */
 #define ADV7180_CON_REG         0x08    /*Unsigned */
-#define CON_REG_MIN             0
-#define CON_REG_DEF             128
-#define CON_REG_MAX             255
-
+#define ADV7180_CON_MIN         0
+#define ADV7180_CON_DEF         128
+#define ADV7180_CON_MAX         255
+/* Brightness*/
 #define ADV7180_BRI_REG         0x0a    /*Signed */
-#define BRI_REG_MIN             -128
-#define BRI_REG_DEF             0
-#define BRI_REG_MAX             127
-
+#define ADV7180_BRI_MIN         -128
+#define ADV7180_BRI_DEF         0
+#define ADV7180_BRI_MAX         127
+/* Hue */
 #define ADV7180_HUE_REG         0x0b    /*Signed, inverted */
-#define HUE_REG_MIN             -127
-#define HUE_REG_DEF             0
-#define HUE_REG_MAX             128
+#define ADV7180_HUE_MIN         -127
+#define ADV7180_HUE_DEF         0
+#define ADV7180_HUE_MAX         128
 
 #define ADV7180_ADI_CTRL_REG                            0x0e
 #define ADV7180_ADI_CTRL_IRQ_SPACE                      0x20
@@ -98,12 +97,12 @@
 #define ADV7180_ICONF1_ACTIVE_LOW       0x01
 #define ADV7180_ICONF1_PSYNC_ONLY       0x10
 #define ADV7180_ICONF1_ACTIVE_TO_CLR    0xC0
-
+/* Saturation */
 #define ADV7180_SD_SAT_CB_REG   0xe3    /*Unsigned */
 #define ADV7180_SD_SAT_CR_REG   0xe4    /*Unsigned */
-#define SAT_REG_MIN             0
-#define SAT_REG_DEF             128
-#define SAT_REG_MAX             255
+#define ADV7180_SAT_MIN         0
+#define ADV7180_SAT_DEF         128
+#define ADV7180_SAT_MAX         255
 
 #define ADV7180_IRQ1_LOCK       0x01
 #define ADV7180_IRQ1_UNLOCK     0x02
@@ -121,18 +120,18 @@
 #define ADV7180_NTSC_V_BIT_END_MANUAL_NVEND     0x4F
 
 struct adv7180_state {
+        struct v4l2_ctrl_handler ctrl_hdl;
         struct v4l2_subdev      sd;
         struct work_struct      work;
         struct mutex            mutex; /* mutual excl. when accessing chip */
         int                     irq;
         v4l2_std_id             curr_norm;
         bool                    autodetect;
-        s8                      brightness;
-        s16                     hue;
-        u8                      contrast;
-        u8                      saturation;
         u8                      input;
 };
+#define to_adv7180_sd(_ctrl) (&container_of(_ctrl->handler,             \
+                                            struct adv7180_state,       \
+                                            ctrl_hdl)->sd)
 
 static v4l2_std_id adv7180_std_to_v4l2(u8 status1)
 {
@@ -237,7 +236,7 @@ static int adv7180_s_routing(struct v4l2_subdev *sd, u32 input,
         if (ret)
                 return ret;
 
-        /*We cannot discriminate between LQFP and 40-pin LFCSP, so accept
+        /* We cannot discriminate between LQFP and 40-pin LFCSP, so accept
          * all inputs and let the card driver take care of validation
          */
         if ((input & ADV7180_INPUT_CONTROL_INSEL_MASK) != input)
@@ -316,117 +315,39 @@ out:
         return ret;
 }
 
-static int adv7180_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
-{
-        switch (qc->id) {
-        case V4L2_CID_BRIGHTNESS:
-                return v4l2_ctrl_query_fill(qc, BRI_REG_MIN, BRI_REG_MAX,
-                                            1, BRI_REG_DEF);
-        case V4L2_CID_HUE:
-                return v4l2_ctrl_query_fill(qc, HUE_REG_MIN, HUE_REG_MAX,
-                                            1, HUE_REG_DEF);
-        case V4L2_CID_CONTRAST:
-                return v4l2_ctrl_query_fill(qc, CON_REG_MIN, CON_REG_MAX,
-                                            1, CON_REG_DEF);
-        case V4L2_CID_SATURATION:
-                return v4l2_ctrl_query_fill(qc, SAT_REG_MIN, SAT_REG_MAX,
-                                            1, SAT_REG_DEF);
-        default:
-                break;
-        }
-
-        return -EINVAL;
-}
-
-static int adv7180_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
-{
-        struct adv7180_state *state = to_state(sd);
-        int ret = mutex_lock_interruptible(&state->mutex);
-        if (ret)
-                return ret;
-
-        switch (ctrl->id) {
-        case V4L2_CID_BRIGHTNESS:
-                ctrl->value = state->brightness;
-                break;
-        case V4L2_CID_HUE:
-                ctrl->value = state->hue;
-                break;
-        case V4L2_CID_CONTRAST:
-                ctrl->value = state->contrast;
-                break;
-        case V4L2_CID_SATURATION:
-                ctrl->value = state->saturation;
-                break;
-        default:
-                ret = -EINVAL;
-        }
-
-        mutex_unlock(&state->mutex);
-        return ret;
-}
-
-static int adv7180_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
+static int adv7180_s_ctrl(struct v4l2_ctrl *ctrl)
 {
+        struct v4l2_subdev *sd = to_adv7180_sd(ctrl);
         struct adv7180_state *state = to_state(sd);
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         int ret = mutex_lock_interruptible(&state->mutex);
+        int val;
+
         if (ret)
                 return ret;
-
+        val = ctrl->val;
         switch (ctrl->id) {
         case V4L2_CID_BRIGHTNESS:
-                if ((ctrl->value > BRI_REG_MAX)
-                    || (ctrl->value < BRI_REG_MIN)) {
-                        ret = -ERANGE;
-                        break;
-                }
-                state->brightness = ctrl->value;
-                ret = i2c_smbus_write_byte_data(client,
-                                                ADV7180_BRI_REG,
-                                                state->brightness);
+                ret = i2c_smbus_write_byte_data(client, ADV7180_BRI_REG, val);
                 break;
         case V4L2_CID_HUE:
-                if ((ctrl->value > HUE_REG_MAX)
-                    || (ctrl->value < HUE_REG_MIN)) {
-                        ret = -ERANGE;
-                        break;
-                }
-                state->hue = ctrl->value;
                 /*Hue is inverted according to HSL chart */
-                ret = i2c_smbus_write_byte_data(client,
-                                                ADV7180_HUE_REG, -state->hue);
+                ret = i2c_smbus_write_byte_data(client, ADV7180_HUE_REG, -val);
                 break;
         case V4L2_CID_CONTRAST:
-                if ((ctrl->value > CON_REG_MAX)
-                    || (ctrl->value < CON_REG_MIN)) {
-                        ret = -ERANGE;
-                        break;
-                }
-                state->contrast = ctrl->value;
-                ret = i2c_smbus_write_byte_data(client,
-                                                ADV7180_CON_REG,
-                                                state->contrast);
+                ret = i2c_smbus_write_byte_data(client, ADV7180_CON_REG, val);
                 break;
         case V4L2_CID_SATURATION:
-                if ((ctrl->value > SAT_REG_MAX)
-                    || (ctrl->value < SAT_REG_MIN)) {
-                        ret = -ERANGE;
-                        break;
-                }
                 /*
                  *This could be V4L2_CID_BLUE_BALANCE/V4L2_CID_RED_BALANCE
                  *Let's not confuse the user, everybody understands saturation
                  */
-                state->saturation = ctrl->value;
-                ret = i2c_smbus_write_byte_data(client,
-                                                ADV7180_SD_SAT_CB_REG,
-                                                state->saturation);
+                ret = i2c_smbus_write_byte_data(client, ADV7180_SD_SAT_CB_REG,
+                                                val);
                 if (ret < 0)
                         break;
-                ret = i2c_smbus_write_byte_data(client,
-                                                ADV7180_SD_SAT_CR_REG,
-                                                state->saturation);
+                ret = i2c_smbus_write_byte_data(client, ADV7180_SD_SAT_CR_REG,
+                                                val);
                 break;
         default:
                 ret = -EINVAL;
@@ -436,6 +357,42 @@ static int adv7180_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
         return ret;
 }
 
+static const struct v4l2_ctrl_ops adv7180_ctrl_ops = {
+        .s_ctrl = adv7180_s_ctrl,
+};
+
+static int adv7180_init_controls(struct adv7180_state *state)
+{
+        v4l2_ctrl_handler_init(&state->ctrl_hdl, 4);
+
+        v4l2_ctrl_new_std(&state->ctrl_hdl, &adv7180_ctrl_ops,
+                          V4L2_CID_BRIGHTNESS, ADV7180_BRI_MIN,
+                          ADV7180_BRI_MAX, 1, ADV7180_BRI_DEF);
+        v4l2_ctrl_new_std(&state->ctrl_hdl, &adv7180_ctrl_ops,
+                          V4L2_CID_CONTRAST, ADV7180_CON_MIN,
+                          ADV7180_CON_MAX, 1, ADV7180_CON_DEF);
+        v4l2_ctrl_new_std(&state->ctrl_hdl, &adv7180_ctrl_ops,
+                          V4L2_CID_SATURATION, ADV7180_SAT_MIN,
+                          ADV7180_SAT_MAX, 1, ADV7180_SAT_DEF);
+        v4l2_ctrl_new_std(&state->ctrl_hdl, &adv7180_ctrl_ops,
+                          V4L2_CID_HUE, ADV7180_HUE_MIN,
+                          ADV7180_HUE_MAX, 1, ADV7180_HUE_DEF);
+        state->sd.ctrl_handler = &state->ctrl_hdl;
+        if (state->ctrl_hdl.error) {
+                int err = state->ctrl_hdl.error;
+
+                v4l2_ctrl_handler_free(&state->ctrl_hdl);
+                return err;
+        }
+        v4l2_ctrl_handler_setup(&state->ctrl_hdl);
+
+        return 0;
+}
+static void adv7180_exit_controls(struct adv7180_state *state)
+{
+        v4l2_ctrl_handler_free(&state->ctrl_hdl);
+}
+
 static const struct v4l2_subdev_video_ops adv7180_video_ops = {
         .querystd = adv7180_querystd,
         .g_input_status = adv7180_g_input_status,
@@ -445,9 +402,9 @@ static const struct v4l2_subdev_video_ops adv7180_video_ops = {
 static const struct v4l2_subdev_core_ops adv7180_core_ops = {
         .g_chip_ident = adv7180_g_chip_ident,
         .s_std = adv7180_s_std,
-        .queryctrl = adv7180_queryctrl,
-        .g_ctrl = adv7180_g_ctrl,
-        .s_ctrl = adv7180_s_ctrl,
+        .queryctrl = v4l2_subdev_queryctrl,
+        .g_ctrl = v4l2_subdev_g_ctrl,
+        .s_ctrl = v4l2_subdev_s_ctrl,
 };
 
 static const struct v4l2_subdev_ops adv7180_ops = {
@@ -539,7 +496,7 @@ static int init_device(struct i2c_client *client, struct adv7180_state *state)
 
         /* register for interrupts */
         if (state->irq > 0) {
-                ret = request_irq(state->irq, adv7180_irq, 0, DRIVER_NAME,
+                ret = request_irq(state->irq, adv7180_irq, 0, KBUILD_MODNAME,
                                   state);
                 if (ret)
                         return ret;
@@ -580,31 +537,6 @@ static int init_device(struct i2c_client *client, struct adv7180_state *state)
                         return ret;
         }
 
-        /*Set default value for controls */
-        ret = i2c_smbus_write_byte_data(client, ADV7180_BRI_REG,
-                                        state->brightness);
-        if (ret < 0)
-                return ret;
-
-        ret = i2c_smbus_write_byte_data(client, ADV7180_HUE_REG, state->hue);
-        if (ret < 0)
-                return ret;
-
-        ret = i2c_smbus_write_byte_data(client, ADV7180_CON_REG,
-                                        state->contrast);
-        if (ret < 0)
-                return ret;
-
-        ret = i2c_smbus_write_byte_data(client, ADV7180_SD_SAT_CB_REG,
-                                        state->saturation);
-        if (ret < 0)
-                return ret;
-
-        ret = i2c_smbus_write_byte_data(client, ADV7180_SD_SAT_CR_REG,
-                                        state->saturation);
-        if (ret < 0)
-                return ret;
-
         return 0;
 }
 
@@ -632,25 +564,26 @@ static __devinit int adv7180_probe(struct i2c_client *client,
         INIT_WORK(&state->work, adv7180_work);
         mutex_init(&state->mutex);
         state->autodetect = true;
-        state->brightness = BRI_REG_DEF;
-        state->hue = HUE_REG_DEF;
-        state->contrast = CON_REG_DEF;
-        state->saturation = SAT_REG_DEF;
         state->input = 0;
         sd = &state->sd;
         v4l2_i2c_subdev_init(sd, client, &adv7180_ops);
 
-        ret = init_device(client, state);
-        if (0 != ret)
+        ret = adv7180_init_controls(state);
+        if (ret)
                 goto err_unreg_subdev;
+        ret = init_device(client, state);
+        if (ret)
+                goto err_free_ctrl;
         return 0;
 
+err_free_ctrl:
+        adv7180_exit_controls(state);
 err_unreg_subdev:
         mutex_destroy(&state->mutex);
         v4l2_device_unregister_subdev(sd);
         kfree(state);
 err:
-        printk(KERN_ERR DRIVER_NAME ": Failed to probe: %d\n", ret);
+        printk(KERN_ERR KBUILD_MODNAME ": Failed to probe: %d\n", ret);
         return ret;
 }
 
@@ -678,7 +611,7 @@ static __devexit int adv7180_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id adv7180_id[] = {
-        {DRIVER_NAME, 0},
+        {KBUILD_MODNAME, 0},
         {},
 };
 
@@ -716,7 +649,7 @@ MODULE_DEVICE_TABLE(i2c, adv7180_id);
 static struct i2c_driver adv7180_driver = {
         .driver = {
                    .owner = THIS_MODULE,
-                   .name = DRIVER_NAME,
+                   .name = KBUILD_MODNAME,
                    },
         .probe = adv7180_probe,
         .remove = __devexit_p(adv7180_remove),
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 5f3a00c2c4f6..38952faaffda 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -345,7 +345,7 @@ static struct CARD {
         { 0x15401836, BTTV_BOARD_PV183,         "Provideo PV183-7" },
         { 0x15401837, BTTV_BOARD_PV183,         "Provideo PV183-8" },
         { 0x3116f200, BTTV_BOARD_TVT_TD3116,    "Tongwei Video Technology TD-3116" },
-
+        { 0x02280279, BTTV_BOARD_APOSONIC_WDVR, "Aposonic W-DVR" },
         { 0, -1, NULL }
 };
 
@@ -2818,6 +2818,14 @@ struct tvcard bttv_tvcards[] = {
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ABSENT,
         },
+        [BTTV_BOARD_APOSONIC_WDVR] = {
+                .name           = "Aposonic W-DVR",
+                .video_inputs   = 4,
+                .svhs           = NO_SVHS,
+                .muxsel         = MUXSEL(2, 3, 1, 0),
+                .tuner_type     = TUNER_ABSENT,
+        },
+
 };
 
 static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index acfe2f3b92d9..79a11240a590 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -184,7 +184,7 @@
 #define BTTV_BOARD_GEOVISION_GV800S_SL     0x9e
 #define BTTV_BOARD_PV183                   0x9f
 #define BTTV_BOARD_TVT_TD3116              0xa0
-
+#define BTTV_BOARD_APOSONIC_WDVR           0xa1
 
 /* more card-specific defines */
 #define PT2254_L_CHANNEL 0x10
diff --git a/drivers/media/video/cx231xx/cx231xx-i2c.c b/drivers/media/video/cx231xx/cx231xx-i2c.c
index 925f3a04e53c..781feed406f7 100644
--- a/drivers/media/video/cx231xx/cx231xx-i2c.c
+++ b/drivers/media/video/cx231xx/cx231xx-i2c.c
@@ -499,16 +499,12 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus)
 
         BUG_ON(!dev->cx231xx_send_usb_command);
 
-        memcpy(&bus->i2c_adap, &cx231xx_adap_template, sizeof(bus->i2c_adap));
-        memcpy(&bus->i2c_algo, &cx231xx_algo, sizeof(bus->i2c_algo));
-        memcpy(&bus->i2c_client, &cx231xx_client_template,
-               sizeof(bus->i2c_client));
-
+        bus->i2c_adap = cx231xx_adap_template;
+        bus->i2c_client = cx231xx_client_template;
         bus->i2c_adap.dev.parent = &dev->udev->dev;
 
         strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name));
 
-        bus->i2c_algo.data = bus;
         bus->i2c_adap.algo_data = bus;
         i2c_set_adapdata(&bus->i2c_adap, &dev->v4l2_dev);
         i2c_add_adapter(&bus->i2c_adap);
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h
index e17447554a0d..a89d020de948 100644
--- a/drivers/media/video/cx231xx/cx231xx.h
+++ b/drivers/media/video/cx231xx/cx231xx.h
@@ -26,7 +26,6 @@
 #include <linux/types.h>
 #include <linux/ioctl.h>
 #include <linux/i2c.h>
-#include <linux/i2c-algo-bit.h>
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
 
@@ -481,7 +480,6 @@ struct cx231xx_i2c {
 
         /* i2c i/o */
         struct i2c_adapter i2c_adap;
-        struct i2c_algo_bit_data i2c_algo;
         struct i2c_client i2c_client;
         u32 i2c_rc;
 
diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index be1e21d8295c..4887314339cb 100644
--- a/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/drivers/media/video/cx23885/cx23885-i2c.c
@@ -316,19 +316,13 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)
 
         dprintk(1, "%s(bus = %d)\n", __func__, bus->nr);
 
-        memcpy(&bus->i2c_adap, &cx23885_i2c_adap_template,
-               sizeof(bus->i2c_adap));
-        memcpy(&bus->i2c_algo, &cx23885_i2c_algo_template,
-               sizeof(bus->i2c_algo));
-        memcpy(&bus->i2c_client, &cx23885_i2c_client_template,
-               sizeof(bus->i2c_client));
-
+        bus->i2c_adap = cx23885_i2c_adap_template;
+        bus->i2c_client = cx23885_i2c_client_template;
         bus->i2c_adap.dev.parent = &dev->pci->dev;
 
         strlcpy(bus->i2c_adap.name, bus->dev->name,
                 sizeof(bus->i2c_adap.name));
 
-        bus->i2c_algo.data = bus;
         bus->i2c_adap.algo_data = bus;
         i2c_set_adapdata(&bus->i2c_adap, &dev->v4l2_dev);
         i2c_add_adapter(&bus->i2c_adap);
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 13c37ec07ae7..5d560c747e09 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -21,7 +21,6 @@
 
 #include <linux/pci.h>
 #include <linux/i2c.h>
-#include <linux/i2c-algo-bit.h>
 #include <linux/kdev_t.h>
 #include <linux/slab.h>
 
@@ -247,7 +246,6 @@ struct cx23885_i2c {
 
         /* i2c i/o */
         struct i2c_adapter         i2c_adap;
-        struct i2c_algo_bit_data   i2c_algo;
         struct i2c_client          i2c_client;
         u32                        i2c_rc;
 
diff --git a/drivers/media/video/cx25821/cx25821-i2c.c b/drivers/media/video/cx25821/cx25821-i2c.c
index 6311180f430c..9844549764c9 100644
--- a/drivers/media/video/cx25821/cx25821-i2c.c
+++ b/drivers/media/video/cx25821/cx25821-i2c.c
@@ -305,18 +305,12 @@ int cx25821_i2c_register(struct cx25821_i2c *bus)
 
         dprintk(1, "%s(bus = %d)\n", __func__, bus->nr);
 
-        memcpy(&bus->i2c_adap, &cx25821_i2c_adap_template,
-               sizeof(bus->i2c_adap));
-        memcpy(&bus->i2c_algo, &cx25821_i2c_algo_template,
-               sizeof(bus->i2c_algo));
-        memcpy(&bus->i2c_client, &cx25821_i2c_client_template,
-               sizeof(bus->i2c_client));
-
+        bus->i2c_adap = cx25821_i2c_adap_template;
+        bus->i2c_client = cx25821_i2c_client_template;
         bus->i2c_adap.dev.parent = &dev->pci->dev;
 
         strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name));
 
-        bus->i2c_algo.data = bus;
         bus->i2c_adap.algo_data = bus;
         i2c_set_adapdata(&bus->i2c_adap, &dev->v4l2_dev);
         i2c_add_adapter(&bus->i2c_adap);
diff --git a/drivers/media/video/cx25821/cx25821-medusa-video.c b/drivers/media/video/cx25821/cx25821-medusa-video.c
index 313fb20a0b47..6a92e5c70c2a 100644
--- a/drivers/media/video/cx25821/cx25821-medusa-video.c
+++ b/drivers/media/video/cx25821/cx25821-medusa-video.c
@@ -499,7 +499,7 @@ static void medusa_set_decoderduration(struct cx25821_dev *dev, int decoder,
         mutex_lock(&dev->lock);
 
         /* no support */
-        if (decoder < VDEC_A && decoder > VDEC_H) {
+        if (decoder < VDEC_A || decoder > VDEC_H) {
                 mutex_unlock(&dev->lock);
                 return;
         }
diff --git a/drivers/media/video/cx25821/cx25821.h b/drivers/media/video/cx25821/cx25821.h
index 029f2934a6d8..8a9c0c869412 100644
--- a/drivers/media/video/cx25821/cx25821.h
+++ b/drivers/media/video/cx25821/cx25821.h
@@ -26,7 +26,6 @@
 
 #include <linux/pci.h>
 #include <linux/i2c.h>
-#include <linux/i2c-algo-bit.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
@@ -213,7 +212,6 @@ struct cx25821_i2c {
 
         /* i2c i/o */
         struct i2c_adapter i2c_adap;
-        struct i2c_algo_bit_data i2c_algo;
         struct i2c_client i2c_client;
         u32 i2c_rc;
 
diff --git a/drivers/media/video/davinci/Kconfig b/drivers/media/video/davinci/Kconfig
index 9337b5605c90..52c5ca68cb3d 100644
--- a/drivers/media/video/davinci/Kconfig
+++ b/drivers/media/video/davinci/Kconfig
@@ -1,30 +1,34 @@
-config DISPLAY_DAVINCI_DM646X_EVM
-        tristate "DM646x EVM Video Display"
-        depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM
-        select VIDEOBUF_DMA_CONTIG
+config VIDEO_DAVINCI_VPIF_DISPLAY
+        tristate "DM646x/DA850/OMAPL138 EVM Video Display"
+        depends on VIDEO_DEV && (MACH_DAVINCI_DM6467_EVM || MACH_DAVINCI_DA850_EVM)
+        select VIDEOBUF2_DMA_CONTIG
         select VIDEO_DAVINCI_VPIF
-        select VIDEO_ADV7343
-        select VIDEO_THS7303
+        select VIDEO_ADV7343 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_THS7303 if VIDEO_HELPER_CHIPS_AUTO
         help
-          Support for DM6467 based display device.
+          Enables Davinci VPIF module used for display devices.
+          This module is common for following DM6467/DA850/OMAPL138
+          based display devices.
 
           To compile this driver as a module, choose M here: the
           module will be called vpif_display.
 
-config CAPTURE_DAVINCI_DM646X_EVM
-        tristate "DM646x EVM Video Capture"
-        depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM
-        select VIDEOBUF_DMA_CONTIG
+config VIDEO_DAVINCI_VPIF_CAPTURE
+        tristate "DM646x/DA850/OMAPL138 EVM Video Capture"
+        depends on VIDEO_DEV && (MACH_DAVINCI_DM6467_EVM || MACH_DAVINCI_DA850_EVM)
+        select VIDEOBUF2_DMA_CONTIG
         select VIDEO_DAVINCI_VPIF
         help
-          Support for DM6467 based capture device.
+          Enables Davinci VPIF module used for captur devices.
+          This module is common for following DM6467/DA850/OMAPL138
+          based capture devices.
 
           To compile this driver as a module, choose M here: the
           module will be called vpif_capture.
 
 config VIDEO_DAVINCI_VPIF
         tristate "DaVinci VPIF Driver"
-        depends on DISPLAY_DAVINCI_DM646X_EVM
+        depends on VIDEO_DAVINCI_VPIF_DISPLAY || VIDEO_DAVINCI_VPIF_CAPTURE
         help
           Support for DaVinci VPIF Driver.
 
diff --git a/drivers/media/video/davinci/Makefile b/drivers/media/video/davinci/Makefile
index ae7dafb689ab..74ed92d09257 100644
--- a/drivers/media/video/davinci/Makefile
+++ b/drivers/media/video/davinci/Makefile
@@ -5,10 +5,10 @@
 # VPIF
 obj-$(CONFIG_VIDEO_DAVINCI_VPIF) += vpif.o
 
-#DM646x EVM Display driver
-obj-$(CONFIG_DISPLAY_DAVINCI_DM646X_EVM) += vpif_display.o
-#DM646x EVM Capture driver
-obj-$(CONFIG_CAPTURE_DAVINCI_DM646X_EVM) += vpif_capture.o
+#VPIF Display driver
+obj-$(CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY) += vpif_display.o
+#VPIF Capture driver
+obj-$(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) += vpif_capture.o
 
 # Capture: DM6446 and DM355
 obj-$(CONFIG_VIDEO_VPSS_SYSTEM) += vpss.o
diff --git a/drivers/media/video/davinci/vpbe_display.c b/drivers/media/video/davinci/vpbe_display.c
index e106b72810a9..6fe7034bea7c 100644
--- a/drivers/media/video/davinci/vpbe_display.c
+++ b/drivers/media/video/davinci/vpbe_display.c
@@ -1083,7 +1083,7 @@ vpbe_display_s_dv_preset(struct file *file, void *priv,
         }
 
         /* Set the given standard in the encoder */
-        if (NULL != vpbe_dev->ops.s_dv_preset)
+        if (!vpbe_dev->ops.s_dv_preset)
                 return -EINVAL;
 
         ret = vpbe_dev->ops.s_dv_preset(vpbe_dev, preset);
@@ -1517,6 +1517,8 @@ static int vpbe_display_g_register(struct file *file, void *priv,
                         struct v4l2_dbg_register *reg)
 {
         struct v4l2_dbg_match *match = &reg->match;
+        struct vpbe_fh *fh = file->private_data;
+        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
 
         if (match->type >= 2) {
                 v4l2_subdev_call(vpbe_dev->venc,
diff --git a/drivers/media/video/davinci/vpif.c b/drivers/media/video/davinci/vpif.c
index af9680273ff9..b3637aff8fee 100644
--- a/drivers/media/video/davinci/vpif.c
+++ b/drivers/media/video/davinci/vpif.c
@@ -1,5 +1,5 @@
 /*
- * vpif - DM646x Video Port Interface driver
+ * vpif - Video Port Interface driver
  * VPIF is a receiver and transmitter for video data. It has two channels(0, 1)
  * that receiveing video byte stream and two channels(2, 3) for video output.
  * The hardware supports SDTV, HDTV formats, raw data capture.
@@ -23,6 +23,8 @@
 #include <linux/spinlock.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/err.h>
 #include <mach/hardware.h>
 
 #include "vpif.h"
@@ -40,6 +42,7 @@ static struct resource	*res;
 spinlock_t vpif_lock;
 
 void __iomem *vpif_base;
+struct clk *vpif_clk;
 
 /**
  * ch_params: video standard configuration parameters for vpif
@@ -346,7 +349,7 @@ static void config_vpif_params(struct vpif_params *vpifparams,
 
                         value = regr(reg);
                         /* Set data width */
-                        value &= ((~(unsigned int)(0x3)) <<
+                        value &= ~(0x3u <<
                                         VPIF_CH_DATA_WIDTH_BIT);
                         value |= ((vpifparams->params.data_sz) <<
                                                      VPIF_CH_DATA_WIDTH_BIT);
@@ -434,10 +437,19 @@ static int __init vpif_probe(struct platform_device *pdev)
                 goto fail;
         }
 
+        vpif_clk = clk_get(&pdev->dev, "vpif");
+        if (IS_ERR(vpif_clk)) {
+                status = PTR_ERR(vpif_clk);
+                goto clk_fail;
+        }
+        clk_enable(vpif_clk);
+
         spin_lock_init(&vpif_lock);
         dev_info(&pdev->dev, "vpif probe success\n");
         return 0;
 
+clk_fail:
+        iounmap(vpif_base);
 fail:
         release_mem_region(res->start, res_len);
         return status;
@@ -445,15 +457,44 @@ fail:
 
 static int __devexit vpif_remove(struct platform_device *pdev)
 {
+        if (vpif_clk) {
+                clk_disable(vpif_clk);
+                clk_put(vpif_clk);
+        }
+
         iounmap(vpif_base);
         release_mem_region(res->start, res_len);
         return 0;
 }
 
+#ifdef CONFIG_PM
+static int vpif_suspend(struct device *dev)
+{
+        clk_disable(vpif_clk);
+        return 0;
+}
+
+static int vpif_resume(struct device *dev)
+{
+        clk_enable(vpif_clk);
+        return 0;
+}
+
+static const struct dev_pm_ops vpif_pm = {
+        .suspend        = vpif_suspend,
+        .resume         = vpif_resume,
+};
+
+#define vpif_pm_ops (&vpif_pm)
+#else
+#define vpif_pm_ops NULL
+#endif
+
 static struct platform_driver vpif_driver = {
         .driver = {
                 .name   = "vpif",
                 .owner = THIS_MODULE,
+                .pm     = vpif_pm_ops,
         },
         .remove = __devexit_p(vpif_remove),
         .probe = vpif_probe,
diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h
index 8bcac65f9294..c2ce4d97c279 100644
--- a/drivers/media/video/davinci/vpif.h
+++ b/drivers/media/video/davinci/vpif.h
@@ -211,6 +211,12 @@ static inline void vpif_clr_bit(u32 reg, u32 bit)
 #define VPIF_CH3_INT_CTRL_SHIFT (6)
 #define VPIF_CH_INT_CTRL_SHIFT  (6)
 
+#define VPIF_CH2_CLIP_ANC_EN    14
+#define VPIF_CH2_CLIP_ACTIVE_EN 13
+
+#define VPIF_CH3_CLIP_ANC_EN    14
+#define VPIF_CH3_CLIP_ACTIVE_EN 13
+
 /* enabled interrupt on both the fields on vpid_ch0_ctrl register */
 #define channel0_intr_assert()  (regw((regr(VPIF_CH0_CTRL)|\
         (VPIF_INT_BOTH << VPIF_CH0_INT_CTRL_SHIFT)), VPIF_CH0_CTRL))
@@ -515,6 +521,30 @@ static inline void channel3_raw_enable(int enable, u8 index)
                 vpif_clr_bit(VPIF_CH3_CTRL, mask);
 }
 
+/* function to enable clipping (for both active and blanking regions) on ch 2 */
+static inline void channel2_clipping_enable(int enable)
+{
+        if (enable) {
+                vpif_set_bit(VPIF_CH2_CTRL, VPIF_CH2_CLIP_ANC_EN);
+                vpif_set_bit(VPIF_CH2_CTRL, VPIF_CH2_CLIP_ACTIVE_EN);
+        } else {
+                vpif_clr_bit(VPIF_CH2_CTRL, VPIF_CH2_CLIP_ANC_EN);
+                vpif_clr_bit(VPIF_CH2_CTRL, VPIF_CH2_CLIP_ACTIVE_EN);
+        }
+}
+
+/* function to enable clipping (for both active and blanking regions) on ch 2 */
+static inline void channel3_clipping_enable(int enable)
+{
+        if (enable) {
+                vpif_set_bit(VPIF_CH3_CTRL, VPIF_CH3_CLIP_ANC_EN);
+                vpif_set_bit(VPIF_CH3_CTRL, VPIF_CH3_CLIP_ACTIVE_EN);
+        } else {
+                vpif_clr_bit(VPIF_CH3_CTRL, VPIF_CH3_CLIP_ANC_EN);
+                vpif_clr_bit(VPIF_CH3_CTRL, VPIF_CH3_CLIP_ACTIVE_EN);
+        }
+}
+
 /* inline function to set buffer addresses in case of Y/C non mux mode */
 static inline void ch2_set_videobuf_addr_yc_nmux(unsigned long top_strt_luma,
                                                  unsigned long btm_strt_luma,
@@ -569,6 +599,21 @@ static inline void ch3_set_vbi_addr(unsigned long top_strt_luma,
         regw(btm_strt_luma, VPIF_CH3_BTM_STRT_ADD_VANC);
 }
 
+static inline int vpif_intr_status(int channel)
+{
+        int status = 0;
+        int mask;
+
+        if (channel < 0 || channel > 3)
+                return 0;
+
+        mask = 1 << channel;
+        status = regr(VPIF_STATUS) & mask;
+        regw(status, VPIF_STATUS_CLR);
+
+        return status;
+}
+
 #define VPIF_MAX_NAME   (30)
 
 /* This structure will store size parameters as per the mode selected by user */
diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c
index 96046957bf21..266025e5d81d 100644
--- a/drivers/media/video/davinci/vpif_capture.c
+++ b/drivers/media/video/davinci/vpif_capture.c
@@ -80,108 +80,45 @@ static struct vpif_config_params config_params = {
 /* global variables */
 static struct vpif_device vpif_obj = { {NULL} };
 static struct device *vpif_dev;
-
-/**
- * vpif_uservirt_to_phys : translate user/virtual address to phy address
- * @virtp: user/virtual address
- *
- * This inline function is used to convert user space virtual address to
- * physical address.
- */
-static inline u32 vpif_uservirt_to_phys(u32 virtp)
-{
-        unsigned long physp = 0;
-        struct mm_struct *mm = current->mm;
-        struct vm_area_struct *vma;
-
-        vma = find_vma(mm, virtp);
-
-        /* For kernel direct-mapped memory, take the easy way */
-        if (virtp >= PAGE_OFFSET)
-                physp = virt_to_phys((void *)virtp);
-        else if (vma && (vma->vm_flags & VM_IO) && (vma->vm_pgoff))
-                /**
-                 * this will catch, kernel-allocated, mmaped-to-usermode
-                 * addresses
-                 */
-                physp = (vma->vm_pgoff << PAGE_SHIFT) + (virtp - vma->vm_start);
-        else {
-                /* otherwise, use get_user_pages() for general userland pages */
-                int res, nr_pages = 1;
-                        struct page *pages;
-
-                down_read(&current->mm->mmap_sem);
-
-                res = get_user_pages(current, current->mm,
-                                     virtp, nr_pages, 1, 0, &pages, NULL);
-                up_read(&current->mm->mmap_sem);
-
-                if (res == nr_pages)
-                        physp = __pa(page_address(&pages[0]) +
-                                     (virtp & ~PAGE_MASK));
-                else {
-                        vpif_err("get_user_pages failed\n");
-                        return 0;
-                }
-        }
-        return physp;
-}
+static void vpif_calculate_offsets(struct channel_obj *ch);
+static void vpif_config_addr(struct channel_obj *ch, int muxmode);
 
 /**
  * buffer_prepare :  callback function for buffer prepare
- * @q : buffer queue ptr
- * @vb: ptr to video buffer
- * @field: field info
+ * @vb: ptr to vb2_buffer
  *
- * This is the callback function for buffer prepare when videobuf_qbuf()
+ * This is the callback function for buffer prepare when vb2_qbuf()
  * function is called. The buffer is prepared and user space virtual address
  * or user address is converted into  physical address
  */
-static int vpif_buffer_prepare(struct videobuf_queue *q,
-                               struct videobuf_buffer *vb,
-                               enum v4l2_field field)
+static int vpif_buffer_prepare(struct vb2_buffer *vb)
 {
         /* Get the file handle object and channel object */
-        struct vpif_fh *fh = q->priv_data;
+        struct vpif_fh *fh = vb2_get_drv_priv(vb->vb2_queue);
+        struct vb2_queue *q = vb->vb2_queue;
         struct channel_obj *ch = fh->channel;
         struct common_obj *common;
         unsigned long addr;
 
-
         vpif_dbg(2, debug, "vpif_buffer_prepare\n");
 
         common = &ch->common[VPIF_VIDEO_INDEX];
 
-        /* If buffer is not initialized, initialize it */
-        if (VIDEOBUF_NEEDS_INIT == vb->state) {
-                vb->width = common->width;
-                vb->height = common->height;
-                vb->size = vb->width * vb->height;
-                vb->field = field;
-        }
-        vb->state = VIDEOBUF_PREPARED;
-        /**
-         * if user pointer memory mechanism is used, get the physical
-         * address of the buffer
-         */
-        if (V4L2_MEMORY_USERPTR == common->memory) {
-                if (0 == vb->baddr) {
-                        vpif_dbg(1, debug, "buffer address is 0\n");
-                        return -EINVAL;
-
-                }
-                vb->boff = vpif_uservirt_to_phys(vb->baddr);
-                if (!IS_ALIGNED(vb->boff, 8))
+        if (vb->state != VB2_BUF_STATE_ACTIVE &&
+                vb->state != VB2_BUF_STATE_PREPARED) {
+                vb2_set_plane_payload(vb, 0, common->fmt.fmt.pix.sizeimage);
+                if (vb2_plane_vaddr(vb, 0) &&
+                vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
                         goto exit;
-        }
+                addr = vb2_dma_contig_plane_dma_addr(vb, 0);
 
-        addr = vb->boff;
-        if (q->streaming) {
-                if (!IS_ALIGNED((addr + common->ytop_off), 8) ||
-                    !IS_ALIGNED((addr + common->ybtm_off), 8) ||
-                    !IS_ALIGNED((addr + common->ctop_off), 8) ||
-                    !IS_ALIGNED((addr + common->cbtm_off), 8))
-                        goto exit;
+                if (q->streaming) {
+                        if (!IS_ALIGNED((addr + common->ytop_off), 8) ||
+                                !IS_ALIGNED((addr + common->ybtm_off), 8) ||
+                                !IS_ALIGNED((addr + common->ctop_off), 8) ||
+                                !IS_ALIGNED((addr + common->cbtm_off), 8))
+                                goto exit;
+                }
         }
         return 0;
 exit:
@@ -190,49 +127,79 @@ exit:
 }
 
 /**
- * vpif_buffer_setup : Callback function for buffer setup.
- * @q: buffer queue ptr
- * @count: number of buffers
- * @size: size of the buffer
+ * vpif_buffer_queue_setup : Callback function for buffer setup.
+ * @vq: vb2_queue ptr
+ * @fmt: v4l2 format
+ * @nbuffers: ptr to number of buffers requested by application
+ * @nplanes:: contains number of distinct video planes needed to hold a frame
+ * @sizes[]: contains the size (in bytes) of each plane.
+ * @alloc_ctxs: ptr to allocation context
  *
  * This callback function is called when reqbuf() is called to adjust
  * the buffer count and buffer size
  */
-static int vpif_buffer_setup(struct videobuf_queue *q, unsigned int *count,
-                             unsigned int *size)
+static int vpif_buffer_queue_setup(struct vb2_queue *vq,
+                                const struct v4l2_format *fmt,
+                                unsigned int *nbuffers, unsigned int *nplanes,
+                                unsigned int sizes[], void *alloc_ctxs[])
 {
         /* Get the file handle object and channel object */
-        struct vpif_fh *fh = q->priv_data;
+        struct vpif_fh *fh = vb2_get_drv_priv(vq);
         struct channel_obj *ch = fh->channel;
         struct common_obj *common;
+        unsigned long size;
 
         common = &ch->common[VPIF_VIDEO_INDEX];
 
         vpif_dbg(2, debug, "vpif_buffer_setup\n");
 
         /* If memory type is not mmap, return */
-        if (V4L2_MEMORY_MMAP != common->memory)
-                return 0;
+        if (V4L2_MEMORY_MMAP == common->memory) {
+                /* Calculate the size of the buffer */
+                size = config_params.channel_bufsize[ch->channel_id];
+                /*
+                 * Checking if the buffer size exceeds the available buffer
+                 * ycmux_mode = 0 means 1 channel mode HD and
+                 * ycmux_mode = 1 means 2 channels mode SD
+                 */
+                if (ch->vpifparams.std_info.ycmux_mode == 0) {
+                        if (config_params.video_limit[ch->channel_id])
+                                while (size * *nbuffers >
+                                        (config_params.video_limit[0]
+                                                + config_params.video_limit[1]))
+                                        (*nbuffers)--;
+                } else {
+                        if (config_params.video_limit[ch->channel_id])
+                                while (size * *nbuffers >
+                                config_params.video_limit[ch->channel_id])
+                                        (*nbuffers)--;
+                }
+
+        } else {
+                size = common->fmt.fmt.pix.sizeimage;
+        }
+
+        if (*nbuffers < config_params.min_numbuffers)
+                *nbuffers = config_params.min_numbuffers;
 
-        /* Calculate the size of the buffer */
-        *size = config_params.channel_bufsize[ch->channel_id];
+        *nplanes = 1;
+        sizes[0] = size;
+        alloc_ctxs[0] = common->alloc_ctx;
 
-        if (*count < config_params.min_numbuffers)
-                *count = config_params.min_numbuffers;
         return 0;
 }
 
 /**
  * vpif_buffer_queue : Callback function to add buffer to DMA queue
- * @q: ptr to videobuf_queue
- * @vb: ptr to videobuf_buffer
+ * @vb: ptr to vb2_buffer
  */
-static void vpif_buffer_queue(struct videobuf_queue *q,
-                              struct videobuf_buffer *vb)
+static void vpif_buffer_queue(struct vb2_buffer *vb)
 {
         /* Get the file handle object and channel object */
-        struct vpif_fh *fh = q->priv_data;
+        struct vpif_fh *fh = vb2_get_drv_priv(vb->vb2_queue);
         struct channel_obj *ch = fh->channel;
+        struct vpif_cap_buffer *buf = container_of(vb,
+                                struct vpif_cap_buffer, vb);
         struct common_obj *common;
 
         common = &ch->common[VPIF_VIDEO_INDEX];
@@ -240,43 +207,189 @@ static void vpif_buffer_queue(struct videobuf_queue *q,
         vpif_dbg(2, debug, "vpif_buffer_queue\n");
 
         /* add the buffer to the DMA queue */
-        list_add_tail(&vb->queue, &common->dma_queue);
-        /* Change state of the buffer */
-        vb->state = VIDEOBUF_QUEUED;
+        list_add_tail(&buf->list, &common->dma_queue);
 }
 
 /**
- * vpif_buffer_release : Callback function to free buffer
- * @q: buffer queue ptr
- * @vb: ptr to video buffer
+ * vpif_buf_cleanup : Callback function to free buffer
+ * @vb: ptr to vb2_buffer
  *
- * This function is called from the videobuf layer to free memory
+ * This function is called from the videobuf2 layer to free memory
  * allocated to  the buffers
  */
-static void vpif_buffer_release(struct videobuf_queue *q,
-                                struct videobuf_buffer *vb)
+static void vpif_buf_cleanup(struct vb2_buffer *vb)
 {
         /* Get the file handle object and channel object */
-        struct vpif_fh *fh = q->priv_data;
+        struct vpif_fh *fh = vb2_get_drv_priv(vb->vb2_queue);
+        struct vpif_cap_buffer *buf = container_of(vb,
+                                        struct vpif_cap_buffer, vb);
         struct channel_obj *ch = fh->channel;
         struct common_obj *common;
+        unsigned long flags;
 
         common = &ch->common[VPIF_VIDEO_INDEX];
 
-        videobuf_dma_contig_free(q, vb);
-        vb->state = VIDEOBUF_NEEDS_INIT;
+        spin_lock_irqsave(&common->irqlock, flags);
+        if (vb->state == VB2_BUF_STATE_ACTIVE)
+                list_del_init(&buf->list);
+        spin_unlock_irqrestore(&common->irqlock, flags);
+
 }
 
-static struct videobuf_queue_ops video_qops = {
-        .buf_setup = vpif_buffer_setup,
-        .buf_prepare = vpif_buffer_prepare,
-        .buf_queue = vpif_buffer_queue,
-        .buf_release = vpif_buffer_release,
-};
+static void vpif_wait_prepare(struct vb2_queue *vq)
+{
+        struct vpif_fh *fh = vb2_get_drv_priv(vq);
+        struct channel_obj *ch = fh->channel;
+        struct common_obj *common;
+
+        common = &ch->common[VPIF_VIDEO_INDEX];
+        mutex_unlock(&common->lock);
+}
+
+static void vpif_wait_finish(struct vb2_queue *vq)
+{
+        struct vpif_fh *fh = vb2_get_drv_priv(vq);
+        struct channel_obj *ch = fh->channel;
+        struct common_obj *common;
+
+        common = &ch->common[VPIF_VIDEO_INDEX];
+        mutex_lock(&common->lock);
+}
+
+static int vpif_buffer_init(struct vb2_buffer *vb)
+{
+        struct vpif_cap_buffer *buf = container_of(vb,
+                                        struct vpif_cap_buffer, vb);
+
+        INIT_LIST_HEAD(&buf->list);
+
+        return 0;
+}
 
 static u8 channel_first_int[VPIF_NUMBER_OF_OBJECTS][2] =
         { {1, 1} };
 
+static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
+{
+        struct vpif_capture_config *vpif_config_data =
+                                        vpif_dev->platform_data;
+        struct vpif_fh *fh = vb2_get_drv_priv(vq);
+        struct channel_obj *ch = fh->channel;
+        struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+        struct vpif_params *vpif = &ch->vpifparams;
+        unsigned long addr = 0;
+        int ret;
+
+                /* If buffer queue is empty, return error */
+        if (list_empty(&common->dma_queue)) {
+                vpif_dbg(1, debug, "buffer queue is empty\n");
+                return -EIO;
+        }
+
+        /* Get the next frame from the buffer queue */
+        common->cur_frm = common->next_frm = list_entry(common->dma_queue.next,
+                                    struct vpif_cap_buffer, list);
+        /* Remove buffer from the buffer queue */
+        list_del(&common->cur_frm->list);
+        /* Mark state of the current frame to active */
+        common->cur_frm->vb.state = VB2_BUF_STATE_ACTIVE;
+        /* Initialize field_id and started member */
+        ch->field_id = 0;
+        common->started = 1;
+        addr = vb2_dma_contig_plane_dma_addr(&common->cur_frm->vb, 0);
+
+        /* Calculate the offset for Y and C data in the buffer */
+        vpif_calculate_offsets(ch);
+
+        if ((vpif->std_info.frm_fmt &&
+            ((common->fmt.fmt.pix.field != V4L2_FIELD_NONE) &&
+             (common->fmt.fmt.pix.field != V4L2_FIELD_ANY))) ||
+            (!vpif->std_info.frm_fmt &&
+             (common->fmt.fmt.pix.field == V4L2_FIELD_NONE))) {
+                vpif_dbg(1, debug, "conflict in field format and std format\n");
+                return -EINVAL;
+        }
+
+        /* configure 1 or 2 channel mode */
+        ret = vpif_config_data->setup_input_channel_mode
+                                        (vpif->std_info.ycmux_mode);
+
+        if (ret < 0) {
+                vpif_dbg(1, debug, "can't set vpif channel mode\n");
+                return ret;
+        }
+
+        /* Call vpif_set_params function to set the parameters and addresses */
+        ret = vpif_set_video_params(vpif, ch->channel_id);
+
+        if (ret < 0) {
+                vpif_dbg(1, debug, "can't set video params\n");
+                return ret;
+        }
+
+        common->started = ret;
+        vpif_config_addr(ch, ret);
+
+        common->set_addr(addr + common->ytop_off,
+                         addr + common->ybtm_off,
+                         addr + common->ctop_off,
+                         addr + common->cbtm_off);
+
+        /**
+         * Set interrupt for both the fields in VPIF Register enable channel in
+         * VPIF register
+         */
+        if ((VPIF_CHANNEL0_VIDEO == ch->channel_id)) {
+                channel0_intr_assert();
+                channel0_intr_enable(1);
+                enable_channel0(1);
+        }
+        if ((VPIF_CHANNEL1_VIDEO == ch->channel_id) ||
+            (common->started == 2)) {
+                channel1_intr_assert();
+                channel1_intr_enable(1);
+                enable_channel1(1);
+        }
+        channel_first_int[VPIF_VIDEO_INDEX][ch->channel_id] = 1;
+
+        return 0;
+}
+
+/* abort streaming and wait for last buffer */
+static int vpif_stop_streaming(struct vb2_queue *vq)
+{
+        struct vpif_fh *fh = vb2_get_drv_priv(vq);
+        struct channel_obj *ch = fh->channel;
+        struct common_obj *common;
+
+        if (!vb2_is_streaming(vq))
+                return 0;
+
+        common = &ch->common[VPIF_VIDEO_INDEX];
+
+        /* release all active buffers */
+        while (!list_empty(&common->dma_queue)) {
+                common->next_frm = list_entry(common->dma_queue.next,
+                                                struct vpif_cap_buffer, list);
+                list_del(&common->next_frm->list);
+                vb2_buffer_done(&common->next_frm->vb, VB2_BUF_STATE_ERROR);
+        }
+
+        return 0;
+}
+
+static struct vb2_ops video_qops = {
+        .queue_setup            = vpif_buffer_queue_setup,
+        .wait_prepare           = vpif_wait_prepare,
+        .wait_finish            = vpif_wait_finish,
+        .buf_init               = vpif_buffer_init,
+        .buf_prepare            = vpif_buffer_prepare,
+        .start_streaming        = vpif_start_streaming,
+        .stop_streaming         = vpif_stop_streaming,
+        .buf_cleanup            = vpif_buf_cleanup,
+        .buf_queue              = vpif_buffer_queue,
+};
+
 /**
  * vpif_process_buffer_complete: process a completed buffer
  * @common: ptr to common channel object
@@ -287,9 +400,9 @@ static u8 channel_first_int[VPIF_NUMBER_OF_OBJECTS][2] =
  */
 static void vpif_process_buffer_complete(struct common_obj *common)
 {
-        do_gettimeofday(&common->cur_frm->ts);
-        common->cur_frm->state = VIDEOBUF_DONE;
-        wake_up_interruptible(&common->cur_frm->done);
+        do_gettimeofday(&common->cur_frm->vb.v4l2_buf.timestamp);
+        vb2_buffer_done(&common->cur_frm->vb,
+                                            VB2_BUF_STATE_DONE);
         /* Make curFrm pointing to nextFrm */
         common->cur_frm = common->next_frm;
 }
@@ -307,14 +420,11 @@ static void vpif_schedule_next_buffer(struct common_obj *common)
         unsigned long addr = 0;
 
         common->next_frm = list_entry(common->dma_queue.next,
-                                     struct videobuf_buffer, queue);
+                                     struct vpif_cap_buffer, list);
         /* Remove that buffer from the buffer queue */
-        list_del(&common->next_frm->queue);
-        common->next_frm->state = VIDEOBUF_ACTIVE;
-        if (V4L2_MEMORY_USERPTR == common->memory)
-                addr = common->next_frm->boff;
-        else
-                addr = videobuf_to_dma_contig(common->next_frm);
+        list_del(&common->next_frm->list);
+        common->next_frm->vb.state = VB2_BUF_STATE_ACTIVE;
+        addr = vb2_dma_contig_plane_dma_addr(&common->next_frm->vb, 0);
 
         /* Set top and bottom field addresses in VPIF registers */
         common->set_addr(addr + common->ytop_off,
@@ -341,6 +451,9 @@ static irqreturn_t vpif_channel_isr(int irq, void *dev_id)
         int fid = -1, i;
 
         channel_id = *(int *)(dev_id);
+        if (!vpif_intr_status(channel_id))
+                return IRQ_NONE;
+
         ch = dev->dev[channel_id];
 
         field = ch->common[VPIF_VIDEO_INDEX].fmt.fmt.pix.field;
@@ -485,10 +598,7 @@ static void vpif_calculate_offsets(struct channel_obj *ch)
         } else
                 vid_ch->buf_field = common->fmt.fmt.pix.field;
 
-        if (V4L2_MEMORY_USERPTR == common->memory)
-                sizeimage = common->fmt.fmt.pix.sizeimage;
-        else
-                sizeimage = config_params.channel_bufsize[ch->channel_id];
+        sizeimage = common->fmt.fmt.pix.sizeimage;
 
         hpitch = common->fmt.fmt.pix.bytesperline;
         vpitch = sizeimage / (hpitch * 2);
@@ -640,10 +750,7 @@ static int vpif_check_format(struct channel_obj *ch,
                 hpitch = vpif_params->std_info.width;
         }
 
-        if (V4L2_MEMORY_USERPTR == common->memory)
-                sizeimage = pixfmt->sizeimage;
-        else
-                sizeimage = config_params.channel_bufsize[ch->channel_id];
+        sizeimage = pixfmt->sizeimage;
 
         vpitch = sizeimage / (hpitch * 2);
 
@@ -703,7 +810,7 @@ static void vpif_config_addr(struct channel_obj *ch, int muxmode)
 }
 
 /**
- * vpfe_mmap : It is used to map kernel space buffers into user spaces
+ * vpif_mmap : It is used to map kernel space buffers into user spaces
  * @filep: file pointer
  * @vma: ptr to vm_area_struct
  */
@@ -716,7 +823,7 @@ static int vpif_mmap(struct file *filep, struct vm_area_struct *vma)
 
         vpif_dbg(2, debug, "vpif_mmap\n");
 
-        return videobuf_mmap_mapper(&common->buffer_queue, vma);
+        return vb2_mmap(&common->buffer_queue, vma);
 }
 
 /**
@@ -733,7 +840,7 @@ static unsigned int vpif_poll(struct file *filep, poll_table * wait)
         vpif_dbg(2, debug, "vpif_poll\n");
 
         if (common->started)
-                return videobuf_poll_stream(filep, &common->buffer_queue, wait);
+                return vb2_poll(&common->buffer_queue, filep, wait);
         return 0;
 }
 
@@ -812,7 +919,7 @@ static int vpif_open(struct file *filep)
  * vpif_release : function to clean up file close
  * @filep: file pointer
  *
- * This function deletes buffer queue, frees the buffers and the vpfe file
+ * This function deletes buffer queue, frees the buffers and the vpif file
  * handle
  */
 static int vpif_release(struct file *filep)
@@ -841,8 +948,8 @@ static int vpif_release(struct file *filep)
                 }
                 common->started = 0;
                 /* Free buffers allocated */
-                videobuf_queue_cancel(&common->buffer_queue);
-                videobuf_mmap_free(&common->buffer_queue);
+                vb2_queue_release(&common->buffer_queue);
+                vb2_dma_contig_cleanup_ctx(common->alloc_ctx);
         }
 
         /* Decrement channel usrs counter */
@@ -872,6 +979,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
         struct channel_obj *ch = fh->channel;
         struct common_obj *common;
         u8 index = 0;
+        struct vb2_queue *q;
 
         vpif_dbg(2, debug, "vpif_reqbufs\n");
 
@@ -887,7 +995,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
                 }
         }
 
-        if (V4L2_BUF_TYPE_VIDEO_CAPTURE != reqbuf->type)
+        if (V4L2_BUF_TYPE_VIDEO_CAPTURE != reqbuf->type || !vpif_dev)
                 return -EINVAL;
 
         index = VPIF_VIDEO_INDEX;
@@ -897,14 +1005,21 @@ static int vpif_reqbufs(struct file *file, void *priv,
         if (0 != common->io_usrs)
                 return -EBUSY;
 
-        /* Initialize videobuf queue as per the buffer type */
-        videobuf_queue_dma_contig_init(&common->buffer_queue,
-                                            &video_qops, NULL,
-                                            &common->irqlock,
-                                            reqbuf->type,
-                                            common->fmt.fmt.pix.field,
-                                            sizeof(struct videobuf_buffer), fh,
-                                            &common->lock);
+        /* Initialize videobuf2 queue as per the buffer type */
+        common->alloc_ctx = vb2_dma_contig_init_ctx(vpif_dev);
+        if (!common->alloc_ctx) {
+                vpif_err("Failed to get the context\n");
+                return -EINVAL;
+        }
+        q = &common->buffer_queue;
+        q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        q->io_modes = VB2_MMAP | VB2_USERPTR;
+        q->drv_priv = fh;
+        q->ops = &video_qops;
+        q->mem_ops = &vb2_dma_contig_memops;
+        q->buf_struct_size = sizeof(struct vpif_cap_buffer);
+
+        vb2_queue_init(q);
 
         /* Set io allowed member of file handle to TRUE */
         fh->io_allowed[index] = 1;
@@ -915,7 +1030,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
         INIT_LIST_HEAD(&common->dma_queue);
 
         /* Allocate buffers */
-        return videobuf_reqbufs(&common->buffer_queue, reqbuf);
+        return vb2_reqbufs(&common->buffer_queue, reqbuf);
 }
 
 /**
@@ -941,7 +1056,7 @@ static int vpif_querybuf(struct file *file, void *priv,
                 return -EINVAL;
         }
 
-        return videobuf_querybuf(&common->buffer_queue, buf);
+        return vb2_querybuf(&common->buffer_queue, buf);
 }
 
 /**
@@ -957,10 +1072,6 @@ static int vpif_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
         struct channel_obj *ch = fh->channel;
         struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
         struct v4l2_buffer tbuf = *buf;
-        struct videobuf_buffer *buf1;
-        unsigned long addr = 0;
-        unsigned long flags;
-        int ret = 0;
 
         vpif_dbg(2, debug, "vpif_qbuf\n");
 
@@ -970,76 +1081,11 @@ static int vpif_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
         }
 
         if (!fh->io_allowed[VPIF_VIDEO_INDEX]) {
-                vpif_err("fh io not allowed \n");
+                vpif_err("fh io not allowed\n");
                 return -EACCES;
         }
 
-        if (!(list_empty(&common->dma_queue)) ||
-            (common->cur_frm != common->next_frm) ||
-            !common->started ||
-            (common->started && (0 == ch->field_id)))
-                return videobuf_qbuf(&common->buffer_queue, buf);
-
-        /* bufferqueue is empty store buffer address in VPIF registers */
-        mutex_lock(&common->buffer_queue.vb_lock);
-        buf1 = common->buffer_queue.bufs[tbuf.index];
-
-        if ((buf1->state == VIDEOBUF_QUEUED) ||
-            (buf1->state == VIDEOBUF_ACTIVE)) {
-                vpif_err("invalid state\n");
-                goto qbuf_exit;
-        }
-
-        switch (buf1->memory) {
-        case V4L2_MEMORY_MMAP:
-                if (buf1->baddr == 0)
-                        goto qbuf_exit;
-                break;
-
-        case V4L2_MEMORY_USERPTR:
-                if (tbuf.length < buf1->bsize)
-                        goto qbuf_exit;
-
-                if ((VIDEOBUF_NEEDS_INIT != buf1->state)
-                            && (buf1->baddr != tbuf.m.userptr)) {
-                        vpif_buffer_release(&common->buffer_queue, buf1);
-                        buf1->baddr = tbuf.m.userptr;
-                }
-                break;
-
-        default:
-                goto qbuf_exit;
-        }
-
-        local_irq_save(flags);
-        ret = vpif_buffer_prepare(&common->buffer_queue, buf1,
-                                        common->buffer_queue.field);
-        if (ret < 0) {
-                local_irq_restore(flags);
-                goto qbuf_exit;
-        }
-
-        buf1->state = VIDEOBUF_ACTIVE;
-
-        if (V4L2_MEMORY_USERPTR == common->memory)
-                addr = buf1->boff;
-        else
-                addr = videobuf_to_dma_contig(buf1);
-
-        common->next_frm = buf1;
-        common->set_addr(addr + common->ytop_off,
-                         addr + common->ybtm_off,
-                         addr + common->ctop_off,
-                         addr + common->cbtm_off);
-
-        local_irq_restore(flags);
-        list_add_tail(&buf1->stream, &common->buffer_queue.stream);
-        mutex_unlock(&common->buffer_queue.vb_lock);
-        return 0;
-
-qbuf_exit:
-        mutex_unlock(&common->buffer_queue.vb_lock);
-        return -EINVAL;
+        return vb2_qbuf(&common->buffer_queue, buf);
 }
 
 /**
@@ -1056,8 +1102,8 @@ static int vpif_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
 
         vpif_dbg(2, debug, "vpif_dqbuf\n");
 
-        return videobuf_dqbuf(&common->buffer_queue, buf,
-                                        file->f_flags & O_NONBLOCK);
+        return vb2_dqbuf(&common->buffer_queue, buf,
+                         (file->f_flags & O_NONBLOCK));
 }
 
 /**
@@ -1070,13 +1116,11 @@ static int vpif_streamon(struct file *file, void *priv,
                                 enum v4l2_buf_type buftype)
 {
 
-        struct vpif_capture_config *config = vpif_dev->platform_data;
         struct vpif_fh *fh = priv;
         struct channel_obj *ch = fh->channel;
         struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
         struct channel_obj *oth_ch = vpif_obj.dev[!ch->channel_id];
         struct vpif_params *vpif;
-        unsigned long addr = 0;
         int ret = 0;
 
         vpif_dbg(2, debug, "vpif_streamon\n");
@@ -1122,95 +1166,13 @@ static int vpif_streamon(struct file *file, void *priv,
                 return ret;
         }
 
-        /* Call videobuf_streamon to start streaming in videobuf */
-        ret = videobuf_streamon(&common->buffer_queue);
+        /* Call vb2_streamon to start streaming in videobuf2 */
+        ret = vb2_streamon(&common->buffer_queue, buftype);
         if (ret) {
-                vpif_dbg(1, debug, "videobuf_streamon\n");
+                vpif_dbg(1, debug, "vb2_streamon\n");
                 return ret;
         }
 
-        /* If buffer queue is empty, return error */
-        if (list_empty(&common->dma_queue)) {
-                vpif_dbg(1, debug, "buffer queue is empty\n");
-                ret = -EIO;
-                goto exit;
-        }
-
-        /* Get the next frame from the buffer queue */
-        common->cur_frm = list_entry(common->dma_queue.next,
-                                    struct videobuf_buffer, queue);
-        common->next_frm = common->cur_frm;
-
-        /* Remove buffer from the buffer queue */
-        list_del(&common->cur_frm->queue);
-        /* Mark state of the current frame to active */
-        common->cur_frm->state = VIDEOBUF_ACTIVE;
-        /* Initialize field_id and started member */
-        ch->field_id = 0;
-        common->started = 1;
-
-        if (V4L2_MEMORY_USERPTR == common->memory)
-                addr = common->cur_frm->boff;
-        else
-                addr = videobuf_to_dma_contig(common->cur_frm);
-
-        /* Calculate the offset for Y and C data in the buffer */
-        vpif_calculate_offsets(ch);
-
-        if ((vpif->std_info.frm_fmt &&
-            ((common->fmt.fmt.pix.field != V4L2_FIELD_NONE) &&
-             (common->fmt.fmt.pix.field != V4L2_FIELD_ANY))) ||
-            (!vpif->std_info.frm_fmt &&
-             (common->fmt.fmt.pix.field == V4L2_FIELD_NONE))) {
-                vpif_dbg(1, debug, "conflict in field format and std format\n");
-                ret = -EINVAL;
-                goto exit;
-        }
-
-        /* configure 1 or 2 channel mode */
-        ret = config->setup_input_channel_mode(vpif->std_info.ycmux_mode);
-
-        if (ret < 0) {
-                vpif_dbg(1, debug, "can't set vpif channel mode\n");
-                goto exit;
-        }
-
-        /* Call vpif_set_params function to set the parameters and addresses */
-        ret = vpif_set_video_params(vpif, ch->channel_id);
-
-        if (ret < 0) {
-                vpif_dbg(1, debug, "can't set video params\n");
-                goto exit;
-        }
-
-        common->started = ret;
-        vpif_config_addr(ch, ret);
-
-        common->set_addr(addr + common->ytop_off,
-                         addr + common->ybtm_off,
-                         addr + common->ctop_off,
-                         addr + common->cbtm_off);
-
-        /**
-         * Set interrupt for both the fields in VPIF Register enable channel in
-         * VPIF register
-         */
-        if ((VPIF_CHANNEL0_VIDEO == ch->channel_id)) {
-                channel0_intr_assert();
-                channel0_intr_enable(1);
-                enable_channel0(1);
-        }
-        if ((VPIF_CHANNEL1_VIDEO == ch->channel_id) ||
-            (common->started == 2)) {
-                channel1_intr_assert();
-                channel1_intr_enable(1);
-                enable_channel1(1);
-        }
-        channel_first_int[VPIF_VIDEO_INDEX][ch->channel_id] = 1;
-        return ret;
-
-exit:
-        videobuf_streamoff(&common->buffer_queue);
         return ret;
 }
 
@@ -1265,7 +1227,7 @@ static int vpif_streamoff(struct file *file, void *priv,
         if (ret && (ret != -ENOIOCTLCMD))
                 vpif_dbg(1, debug, "stream off failed in subdev\n");
 
-        return videobuf_streamoff(&common->buffer_queue);
+        return vb2_streamoff(&common->buffer_queue, buftype);
 }
 
 /**
@@ -1679,7 +1641,7 @@ static int vpif_querycap(struct file *file, void  *priv,
 
         cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
         strlcpy(cap->driver, "vpif capture", sizeof(cap->driver));
-        strlcpy(cap->bus_info, "DM646x Platform", sizeof(cap->bus_info));
+        strlcpy(cap->bus_info, "VPIF Platform", sizeof(cap->bus_info));
         strlcpy(cap->card, config->card_name, sizeof(cap->card));
 
         return 0;
@@ -2168,6 +2130,7 @@ static __init int vpif_probe(struct platform_device *pdev)
         struct video_device *vfd;
         struct resource *res;
         int subdev_count;
+        size_t size;
 
         vpif_dev = &pdev->dev;
 
@@ -2186,8 +2149,8 @@ static __init int vpif_probe(struct platform_device *pdev)
         k = 0;
         while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, k))) {
                 for (i = res->start; i <= res->end; i++) {
-                        if (request_irq(i, vpif_channel_isr, IRQF_DISABLED,
-                                        "DM646x_Capture",
+                        if (request_irq(i, vpif_channel_isr, IRQF_SHARED,
+                                        "VPIF_Capture",
                                 (void *)(&vpif_obj.dev[k]->channel_id))) {
                                 err = -EBUSY;
                                 i--;
@@ -2216,12 +2179,29 @@ static __init int vpif_probe(struct platform_device *pdev)
                 vfd->v4l2_dev = &vpif_obj.v4l2_dev;
                 vfd->release = video_device_release;
                 snprintf(vfd->name, sizeof(vfd->name),
-                         "DM646x_VPIFCapture_DRIVER_V%s",
+                         "VPIF_Capture_DRIVER_V%s",
                          VPIF_CAPTURE_VERSION);
                 /* Set video_dev to the video device */
                 ch->video_dev = vfd;
         }
 
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (res) {
+                size = resource_size(res);
+                /* The resources are divided into two equal memory and when we
+                 * have HD output we can add them together
+                 */
+                for (j = 0; j < VPIF_CAPTURE_MAX_DEVICES; j++) {
+                        ch = vpif_obj.dev[j];
+                        ch->channel_id = j;
+                        /* only enabled if second resource exists */
+                        config_params.video_limit[ch->channel_id] = 0;
+                        if (size)
+                                config_params.video_limit[ch->channel_id] =
+                                                                        size/2;
+                }
+        }
+
         for (j = 0; j < VPIF_CAPTURE_MAX_DEVICES; j++) {
                 ch = vpif_obj.dev[j];
                 ch->channel_id = j;
@@ -2275,8 +2255,7 @@ static __init int vpif_probe(struct platform_device *pdev)
                         vpif_obj.sd[i]->grp_id = 1 << i;
         }
 
-        v4l2_info(&vpif_obj.v4l2_dev,
-                        "DM646x VPIF capture driver initialized\n");
+        v4l2_info(&vpif_obj.v4l2_dev, "VPIF capture driver initialized\n");
         return 0;
 
 probe_subdev_out:
@@ -2333,26 +2312,70 @@ static int vpif_remove(struct platform_device *device)
         return 0;
 }
 
+#ifdef CONFIG_PM
 /**
  * vpif_suspend: vpif device suspend
- *
- * TODO: Add suspend code here
  */
-static int
-vpif_suspend(struct device *dev)
+static int vpif_suspend(struct device *dev)
 {
-        return -1;
+
+        struct common_obj *common;
+        struct channel_obj *ch;
+        int i;
+
+        for (i = 0; i < VPIF_CAPTURE_MAX_DEVICES; i++) {
+                /* Get the pointer to the channel object */
+                ch = vpif_obj.dev[i];
+                common = &ch->common[VPIF_VIDEO_INDEX];
+                mutex_lock(&common->lock);
+                if (ch->usrs && common->io_usrs) {
+                        /* Disable channel */
+                        if (ch->channel_id == VPIF_CHANNEL0_VIDEO) {
+                                enable_channel0(0);
+                                channel0_intr_enable(0);
+                        }
+                        if (ch->channel_id == VPIF_CHANNEL1_VIDEO ||
+                            common->started == 2) {
+                                enable_channel1(0);
+                                channel1_intr_enable(0);
+                        }
+                }
+                mutex_unlock(&common->lock);
+        }
+
+        return 0;
 }
 
-/**
+/*
  * vpif_resume: vpif device suspend
- *
- * TODO: Add resume code here
  */
-static int
-vpif_resume(struct device *dev)
+static int vpif_resume(struct device *dev)
 {
-        return -1;
+        struct common_obj *common;
+        struct channel_obj *ch;
+        int i;
+
+        for (i = 0; i < VPIF_CAPTURE_MAX_DEVICES; i++) {
+                /* Get the pointer to the channel object */
+                ch = vpif_obj.dev[i];
+                common = &ch->common[VPIF_VIDEO_INDEX];
+                mutex_lock(&common->lock);
+                if (ch->usrs && common->io_usrs) {
+                        /* Disable channel */
+                        if (ch->channel_id == VPIF_CHANNEL0_VIDEO) {
+                                enable_channel0(1);
+                                channel0_intr_enable(1);
+                        }
+                        if (ch->channel_id == VPIF_CHANNEL1_VIDEO ||
+                            common->started == 2) {
+                                enable_channel1(1);
+                                channel1_intr_enable(1);
+                        }
+                }
+                mutex_unlock(&common->lock);
+        }
+
+        return 0;
 }
 
 static const struct dev_pm_ops vpif_dev_pm_ops = {
@@ -2360,11 +2383,16 @@ static const struct dev_pm_ops vpif_dev_pm_ops = {
         .resume = vpif_resume,
 };
 
+#define vpif_pm_ops (&vpif_dev_pm_ops)
+#else
+#define vpif_pm_ops NULL
+#endif
+
 static __refdata struct platform_driver vpif_driver = {
         .driver = {
                 .name   = "vpif_capture",
                 .owner  = THIS_MODULE,
-                .pm = &vpif_dev_pm_ops,
+                .pm     = vpif_pm_ops,
         },
         .probe = vpif_probe,
         .remove = vpif_remove,
diff --git a/drivers/media/video/davinci/vpif_capture.h b/drivers/media/video/davinci/vpif_capture.h
index a693d4ebda55..3511510f43ee 100644
--- a/drivers/media/video/davinci/vpif_capture.h
+++ b/drivers/media/video/davinci/vpif_capture.h
@@ -26,7 +26,7 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-device.h>
 #include <media/videobuf-core.h>
-#include <media/videobuf-dma-contig.h>
+#include <media/videobuf2-dma-contig.h>
 #include <media/davinci/vpif_types.h>
 
 #include "vpif.h"
@@ -60,11 +60,16 @@ struct video_obj {
         u32 input_idx;
 };
 
+struct vpif_cap_buffer {
+        struct vb2_buffer vb;
+        struct list_head list;
+};
+
 struct common_obj {
         /* Pointer pointing to current v4l2_buffer */
-        struct videobuf_buffer *cur_frm;
+        struct vpif_cap_buffer *cur_frm;
         /* Pointer pointing to current v4l2_buffer */
-        struct videobuf_buffer *next_frm;
+        struct vpif_cap_buffer *next_frm;
         /*
          * This field keeps track of type of buffer exchange mechanism
          * user has selected
@@ -73,7 +78,9 @@ struct common_obj {
         /* Used to store pixel format */
         struct v4l2_format fmt;
         /* Buffer queue used in video-buf */
-        struct videobuf_queue buffer_queue;
+        struct vb2_queue buffer_queue;
+        /* allocator-specific contexts for each plane */
+        struct vb2_alloc_ctx *alloc_ctx;
         /* Queue of filled frames */
         struct list_head dma_queue;
         /* Used in video-buf */
@@ -151,6 +158,7 @@ struct vpif_config_params {
         u32 min_bufsize[VPIF_CAPTURE_NUM_CHANNELS];
         u32 channel_bufsize[VPIF_CAPTURE_NUM_CHANNELS];
         u8 default_device[VPIF_CAPTURE_NUM_CHANNELS];
+        u32 video_limit[VPIF_CAPTURE_NUM_CHANNELS];
         u8 max_device_type;
 };
 /* Struct which keeps track of the line numbers for the sliced vbi service */
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
index e6488ee7db18..e129c98921ad 100644
--- a/drivers/media/video/davinci/vpif_display.c
+++ b/drivers/media/video/davinci/vpif_display.c
@@ -46,7 +46,7 @@ MODULE_DESCRIPTION("TI DaVinci VPIF Display driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(VPIF_DISPLAY_VERSION);
 
-#define DM646X_V4L2_STD (V4L2_STD_525_60 | V4L2_STD_625_50)
+#define VPIF_V4L2_STD (V4L2_STD_525_60 | V4L2_STD_625_50)
 
 #define vpif_err(fmt, arg...)   v4l2_err(&vpif_obj.v4l2_dev, fmt, ## arg)
 #define vpif_dbg(level, debug, fmt, arg...)     \
@@ -82,89 +82,38 @@ static struct vpif_config_params config_params = {
 
 static struct vpif_device vpif_obj = { {NULL} };
 static struct device *vpif_dev;
+static void vpif_calculate_offsets(struct channel_obj *ch);
+static void vpif_config_addr(struct channel_obj *ch, int muxmode);
 
 /*
- * vpif_uservirt_to_phys: This function is used to convert user
- * space virtual address to physical address.
- */
-static u32 vpif_uservirt_to_phys(u32 virtp)
-{
-        struct mm_struct *mm = current->mm;
-        unsigned long physp = 0;
-        struct vm_area_struct *vma;
-
-        vma = find_vma(mm, virtp);
-
-        /* For kernel direct-mapped memory, take the easy way */
-        if (virtp >= PAGE_OFFSET) {
-                physp = virt_to_phys((void *)virtp);
-        } else if (vma && (vma->vm_flags & VM_IO) && (vma->vm_pgoff)) {
-                /* this will catch, kernel-allocated, mmaped-to-usermode addr */
-                physp = (vma->vm_pgoff << PAGE_SHIFT) + (virtp - vma->vm_start);
-        } else {
-                /* otherwise, use get_user_pages() for general userland pages */
-                int res, nr_pages = 1;
-                struct page *pages;
-                down_read(&current->mm->mmap_sem);
-
-                res = get_user_pages(current, current->mm,
-                                     virtp, nr_pages, 1, 0, &pages, NULL);
-                up_read(&current->mm->mmap_sem);
-
-                if (res == nr_pages) {
-                        physp = __pa(page_address(&pages[0]) +
-                                                        (virtp & ~PAGE_MASK));
-                } else {
-                        vpif_err("get_user_pages failed\n");
-                        return 0;
-                }
-        }
-
-        return physp;
-}
-
-/*
- * buffer_prepare: This is the callback function called from videobuf_qbuf()
+ * buffer_prepare: This is the callback function called from vb2_qbuf()
  * function the buffer is prepared and user space virtual address is converted
  * into physical address
  */
-static int vpif_buffer_prepare(struct videobuf_queue *q,
-                               struct videobuf_buffer *vb,
-                               enum v4l2_field field)
+static int vpif_buffer_prepare(struct vb2_buffer *vb)
 {
-        struct vpif_fh *fh = q->priv_data;
+        struct vpif_fh *fh = vb2_get_drv_priv(vb->vb2_queue);
+        struct vb2_queue *q = vb->vb2_queue;
         struct common_obj *common;
         unsigned long addr;
 
         common = &fh->channel->common[VPIF_VIDEO_INDEX];
-        if (VIDEOBUF_NEEDS_INIT == vb->state) {
-                vb->width       = common->width;
-                vb->height      = common->height;
-                vb->size        = vb->width * vb->height;
-                vb->field       = field;
-        }
-        vb->state = VIDEOBUF_PREPARED;
-
-        /* if user pointer memory mechanism is used, get the physical
-         * address of the buffer */
-        if (V4L2_MEMORY_USERPTR == common->memory) {
-                if (!vb->baddr) {
-                        vpif_err("buffer_address is 0\n");
-                        return -EINVAL;
-                }
-
-                vb->boff = vpif_uservirt_to_phys(vb->baddr);
-                if (!ISALIGNED(vb->boff))
+        if (vb->state != VB2_BUF_STATE_ACTIVE &&
+                vb->state != VB2_BUF_STATE_PREPARED) {
+                vb2_set_plane_payload(vb, 0, common->fmt.fmt.pix.sizeimage);
+                if (vb2_plane_vaddr(vb, 0) &&
+                vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
                         goto buf_align_exit;
-        }
 
-        addr = vb->boff;
-        if (q->streaming && (V4L2_BUF_TYPE_SLICED_VBI_OUTPUT != q->type)) {
-                if (!ISALIGNED(addr + common->ytop_off) ||
-                    !ISALIGNED(addr + common->ybtm_off) ||
-                    !ISALIGNED(addr + common->ctop_off) ||
-                    !ISALIGNED(addr + common->cbtm_off))
-                        goto buf_align_exit;
+                addr = vb2_dma_contig_plane_dma_addr(vb, 0);
+                if (q->streaming &&
+                        (V4L2_BUF_TYPE_SLICED_VBI_OUTPUT != q->type)) {
+                        if (!ISALIGNED(addr + common->ytop_off) ||
+                        !ISALIGNED(addr + common->ybtm_off) ||
+                        !ISALIGNED(addr + common->ctop_off) ||
+                        !ISALIGNED(addr + common->cbtm_off))
+                                goto buf_align_exit;
+                }
         }
         return 0;
 
@@ -174,86 +123,255 @@ buf_align_exit:
 }
 
 /*
- * vpif_buffer_setup: This function allocates memory for the buffers
+ * vpif_buffer_queue_setup: This function allocates memory for the buffers
  */
-static int vpif_buffer_setup(struct videobuf_queue *q, unsigned int *count,
-                                unsigned int *size)
+static int vpif_buffer_queue_setup(struct vb2_queue *vq,
+                                const struct v4l2_format *fmt,
+                                unsigned int *nbuffers, unsigned int *nplanes,
+                                unsigned int sizes[], void *alloc_ctxs[])
 {
-        struct vpif_fh *fh = q->priv_data;
+        struct vpif_fh *fh = vb2_get_drv_priv(vq);
         struct channel_obj *ch = fh->channel;
         struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+        unsigned long size;
+
+        if (V4L2_MEMORY_MMAP == common->memory) {
+                size = config_params.channel_bufsize[ch->channel_id];
+                /*
+                * Checking if the buffer size exceeds the available buffer
+                * ycmux_mode = 0 means 1 channel mode HD and
+                * ycmux_mode = 1 means 2 channels mode SD
+                */
+                if (ch->vpifparams.std_info.ycmux_mode == 0) {
+                        if (config_params.video_limit[ch->channel_id])
+                                while (size * *nbuffers >
+                                        (config_params.video_limit[0]
+                                                + config_params.video_limit[1]))
+                                        (*nbuffers)--;
+                } else {
+                        if (config_params.video_limit[ch->channel_id])
+                                while (size * *nbuffers >
+                                config_params.video_limit[ch->channel_id])
+                                        (*nbuffers)--;
+                }
+        } else {
+                size = common->fmt.fmt.pix.sizeimage;
+        }
 
-        if (V4L2_MEMORY_MMAP != common->memory)
-                return 0;
-
-        *size = config_params.channel_bufsize[ch->channel_id];
-        if (*count < config_params.min_numbuffers)
-                *count = config_params.min_numbuffers;
+        if (*nbuffers < config_params.min_numbuffers)
+                        *nbuffers = config_params.min_numbuffers;
 
+        *nplanes = 1;
+        sizes[0] = size;
+        alloc_ctxs[0] = common->alloc_ctx;
         return 0;
 }
 
 /*
  * vpif_buffer_queue: This function adds the buffer to DMA queue
  */
-static void vpif_buffer_queue(struct videobuf_queue *q,
-                              struct videobuf_buffer *vb)
+static void vpif_buffer_queue(struct vb2_buffer *vb)
 {
-        struct vpif_fh *fh = q->priv_data;
+        struct vpif_fh *fh = vb2_get_drv_priv(vb->vb2_queue);
+        struct vpif_disp_buffer *buf = container_of(vb,
+                                struct vpif_disp_buffer, vb);
+        struct channel_obj *ch = fh->channel;
         struct common_obj *common;
 
-        common = &fh->channel->common[VPIF_VIDEO_INDEX];
+        common = &ch->common[VPIF_VIDEO_INDEX];
 
         /* add the buffer to the DMA queue */
-        list_add_tail(&vb->queue, &common->dma_queue);
-        vb->state = VIDEOBUF_QUEUED;
+        list_add_tail(&buf->list, &common->dma_queue);
 }
 
 /*
- * vpif_buffer_release: This function is called from the videobuf layer to
+ * vpif_buf_cleanup: This function is called from the videobuf2 layer to
  * free memory allocated to the buffers
  */
-static void vpif_buffer_release(struct videobuf_queue *q,
-                                struct videobuf_buffer *vb)
+static void vpif_buf_cleanup(struct vb2_buffer *vb)
+{
+        struct vpif_fh *fh = vb2_get_drv_priv(vb->vb2_queue);
+        struct vpif_disp_buffer *buf = container_of(vb,
+                                        struct vpif_disp_buffer, vb);
+        struct channel_obj *ch = fh->channel;
+        struct common_obj *common;
+        unsigned long flags;
+
+        common = &ch->common[VPIF_VIDEO_INDEX];
+
+        spin_lock_irqsave(&common->irqlock, flags);
+        if (vb->state == VB2_BUF_STATE_ACTIVE)
+                list_del_init(&buf->list);
+        spin_unlock_irqrestore(&common->irqlock, flags);
+}
+
+static void vpif_wait_prepare(struct vb2_queue *vq)
 {
-        struct vpif_fh *fh = q->priv_data;
+        struct vpif_fh *fh = vb2_get_drv_priv(vq);
         struct channel_obj *ch = fh->channel;
         struct common_obj *common;
-        unsigned int buf_size = 0;
 
         common = &ch->common[VPIF_VIDEO_INDEX];
+        mutex_unlock(&common->lock);
+}
 
-        videobuf_dma_contig_free(q, vb);
-        vb->state = VIDEOBUF_NEEDS_INIT;
+static void vpif_wait_finish(struct vb2_queue *vq)
+{
+        struct vpif_fh *fh = vb2_get_drv_priv(vq);
+        struct channel_obj *ch = fh->channel;
+        struct common_obj *common;
 
-        if (V4L2_MEMORY_MMAP != common->memory)
-                return;
+        common = &ch->common[VPIF_VIDEO_INDEX];
+        mutex_lock(&common->lock);
+}
 
-        buf_size = config_params.channel_bufsize[ch->channel_id];
+static int vpif_buffer_init(struct vb2_buffer *vb)
+{
+        struct vpif_disp_buffer *buf = container_of(vb,
+                                        struct vpif_disp_buffer, vb);
+
+        INIT_LIST_HEAD(&buf->list);
+
+        return 0;
 }
 
-static struct videobuf_queue_ops video_qops = {
-        .buf_setup      = vpif_buffer_setup,
-        .buf_prepare    = vpif_buffer_prepare,
-        .buf_queue      = vpif_buffer_queue,
-        .buf_release    = vpif_buffer_release,
-};
 static u8 channel_first_int[VPIF_NUMOBJECTS][2] = { {1, 1} };
 
+static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
+{
+        struct vpif_display_config *vpif_config_data =
+                                        vpif_dev->platform_data;
+        struct vpif_fh *fh = vb2_get_drv_priv(vq);
+        struct channel_obj *ch = fh->channel;
+        struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+        struct vpif_params *vpif = &ch->vpifparams;
+        unsigned long addr = 0;
+        int ret;
+
+        /* If buffer queue is empty, return error */
+        if (list_empty(&common->dma_queue)) {
+                vpif_err("buffer queue is empty\n");
+                return -EIO;
+        }
+
+        /* Get the next frame from the buffer queue */
+        common->next_frm = common->cur_frm =
+                            list_entry(common->dma_queue.next,
+                                       struct vpif_disp_buffer, list);
+
+        list_del(&common->cur_frm->list);
+        /* Mark state of the current frame to active */
+        common->cur_frm->vb.state = VB2_BUF_STATE_ACTIVE;
+
+        /* Initialize field_id and started member */
+        ch->field_id = 0;
+        common->started = 1;
+        addr = vb2_dma_contig_plane_dma_addr(&common->cur_frm->vb, 0);
+        /* Calculate the offset for Y and C data  in the buffer */
+        vpif_calculate_offsets(ch);
+
+        if ((ch->vpifparams.std_info.frm_fmt &&
+                ((common->fmt.fmt.pix.field != V4L2_FIELD_NONE)
+                && (common->fmt.fmt.pix.field != V4L2_FIELD_ANY)))
+                || (!ch->vpifparams.std_info.frm_fmt
+                && (common->fmt.fmt.pix.field == V4L2_FIELD_NONE))) {
+                vpif_err("conflict in field format and std format\n");
+                return -EINVAL;
+        }
+
+        /* clock settings */
+        ret =
+            vpif_config_data->set_clock(ch->vpifparams.std_info.ycmux_mode,
+                                        ch->vpifparams.std_info.hd_sd);
+        if (ret < 0) {
+                vpif_err("can't set clock\n");
+                return ret;
+        }
+
+        /* set the parameters and addresses */
+        ret = vpif_set_video_params(vpif, ch->channel_id + 2);
+        if (ret < 0)
+                return ret;
+
+        common->started = ret;
+        vpif_config_addr(ch, ret);
+        common->set_addr((addr + common->ytop_off),
+                            (addr + common->ybtm_off),
+                            (addr + common->ctop_off),
+                            (addr + common->cbtm_off));
+
+        /* Set interrupt for both the fields in VPIF
+            Register enable channel in VPIF register */
+        if (VPIF_CHANNEL2_VIDEO == ch->channel_id) {
+                channel2_intr_assert();
+                channel2_intr_enable(1);
+                enable_channel2(1);
+                if (vpif_config_data->ch2_clip_en)
+                        channel2_clipping_enable(1);
+        }
+
+        if ((VPIF_CHANNEL3_VIDEO == ch->channel_id)
+                || (common->started == 2)) {
+                channel3_intr_assert();
+                channel3_intr_enable(1);
+                enable_channel3(1);
+                if (vpif_config_data->ch3_clip_en)
+                        channel3_clipping_enable(1);
+        }
+        channel_first_int[VPIF_VIDEO_INDEX][ch->channel_id] = 1;
+
+        return 0;
+}
+
+/* abort streaming and wait for last buffer */
+static int vpif_stop_streaming(struct vb2_queue *vq)
+{
+        struct vpif_fh *fh = vb2_get_drv_priv(vq);
+        struct channel_obj *ch = fh->channel;
+        struct common_obj *common;
+
+        if (!vb2_is_streaming(vq))
+                return 0;
+
+        common = &ch->common[VPIF_VIDEO_INDEX];
+
+        /* release all active buffers */
+        while (!list_empty(&common->dma_queue)) {
+                common->next_frm = list_entry(common->dma_queue.next,
+                                                struct vpif_disp_buffer, list);
+                list_del(&common->next_frm->list);
+                vb2_buffer_done(&common->next_frm->vb, VB2_BUF_STATE_ERROR);
+        }
+
+        return 0;
+}
+
+static struct vb2_ops video_qops = {
+        .queue_setup            = vpif_buffer_queue_setup,
+        .wait_prepare           = vpif_wait_prepare,
+        .wait_finish            = vpif_wait_finish,
+        .buf_init               = vpif_buffer_init,
+        .buf_prepare            = vpif_buffer_prepare,
+        .start_streaming        = vpif_start_streaming,
+        .stop_streaming         = vpif_stop_streaming,
+        .buf_cleanup            = vpif_buf_cleanup,
+        .buf_queue              = vpif_buffer_queue,
+};
+
 static void process_progressive_mode(struct common_obj *common)
 {
         unsigned long addr = 0;
 
         /* Get the next buffer from buffer queue */
         common->next_frm = list_entry(common->dma_queue.next,
-                                struct videobuf_buffer, queue);
+                                struct vpif_disp_buffer, list);
         /* Remove that buffer from the buffer queue */
-        list_del(&common->next_frm->queue);
+        list_del(&common->next_frm->list);
         /* Mark status of the buffer as active */
-        common->next_frm->state = VIDEOBUF_ACTIVE;
+        common->next_frm->vb.state = VB2_BUF_STATE_ACTIVE;
 
         /* Set top and bottom field addrs in VPIF registers */
-        addr = videobuf_to_dma_contig(common->next_frm);
+        addr = vb2_dma_contig_plane_dma_addr(&common->next_frm->vb, 0);
         common->set_addr(addr + common->ytop_off,
                                  addr + common->ybtm_off,
                                  addr + common->ctop_off,
@@ -271,11 +389,10 @@ static void process_interlaced_mode(int fid, struct common_obj *common)
                 /* one frame is displayed If next frame is
                  *  available, release cur_frm and move on */
                 /* Copy frame display time */
-                do_gettimeofday(&common->cur_frm->ts);
+                do_gettimeofday(&common->cur_frm->vb.v4l2_buf.timestamp);
                 /* Change status of the cur_frm */
-                common->cur_frm->state = VIDEOBUF_DONE;
-                /* unlock semaphore on cur_frm */
-                wake_up_interruptible(&common->cur_frm->done);
+                vb2_buffer_done(&common->cur_frm->vb,
+                                            VB2_BUF_STATE_DONE);
                 /* Make cur_frm pointing to next_frm */
                 common->cur_frm = common->next_frm;
 
@@ -307,6 +424,9 @@ static irqreturn_t vpif_channel_isr(int irq, void *dev_id)
         int channel_id = 0;
 
         channel_id = *(int *)(dev_id);
+        if (!vpif_intr_status(channel_id + 2))
+                return IRQ_NONE;
+
         ch = dev->dev[channel_id];
         field = ch->common[VPIF_VIDEO_INDEX].fmt.fmt.pix.field;
         for (i = 0; i < VPIF_NUMOBJECTS; i++) {
@@ -323,9 +443,10 @@ static irqreturn_t vpif_channel_isr(int irq, void *dev_id)
                         if (!channel_first_int[i][channel_id]) {
                                 /* Mark status of the cur_frm to
                                  * done and unlock semaphore on it */
-                                do_gettimeofday(&common->cur_frm->ts);
-                                common->cur_frm->state = VIDEOBUF_DONE;
-                                wake_up_interruptible(&common->cur_frm->done);
+                                do_gettimeofday(&common->cur_frm->vb.
+                                                v4l2_buf.timestamp);
+                                vb2_buffer_done(&common->cur_frm->vb,
+                                            VB2_BUF_STATE_DONE);
                                 /* Make cur_frm pointing to next_frm */
                                 common->cur_frm = common->next_frm;
                         }
@@ -443,10 +564,7 @@ static void vpif_calculate_offsets(struct channel_obj *ch)
                 vid_ch->buf_field = common->fmt.fmt.pix.field;
         }
 
-        if (V4L2_MEMORY_USERPTR == common->memory)
-                sizeimage = common->fmt.fmt.pix.sizeimage;
-        else
-                sizeimage = config_params.channel_bufsize[ch->channel_id];
+        sizeimage = common->fmt.fmt.pix.sizeimage;
 
         hpitch = common->fmt.fmt.pix.bytesperline;
         vpitch = sizeimage / (hpitch * 2);
@@ -523,10 +641,7 @@ static int vpif_check_format(struct channel_obj *ch,
         if (pixfmt->bytesperline <= 0)
                 goto invalid_pitch_exit;
 
-        if (V4L2_MEMORY_USERPTR == common->memory)
-                sizeimage = pixfmt->sizeimage;
-        else
-                sizeimage = config_params.channel_bufsize[ch->channel_id];
+        sizeimage = pixfmt->sizeimage;
 
         if (vpif_update_resolution(ch))
                 return -EINVAL;
@@ -583,7 +698,7 @@ static int vpif_mmap(struct file *filep, struct vm_area_struct *vma)
 
         vpif_dbg(2, debug, "vpif_mmap\n");
 
-        return videobuf_mmap_mapper(&common->buffer_queue, vma);
+        return vb2_mmap(&common->buffer_queue, vma);
 }
 
 /*
@@ -596,7 +711,7 @@ static unsigned int vpif_poll(struct file *filep, poll_table *wait)
         struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
 
         if (common->started)
-                return videobuf_poll_stream(filep, &common->buffer_queue, wait);
+                return vb2_poll(&common->buffer_queue, filep, wait);
 
         return 0;
 }
@@ -665,9 +780,11 @@ static int vpif_release(struct file *filep)
                         channel3_intr_enable(0);
                 }
                 common->started = 0;
+
                 /* Free buffers allocated */
-                videobuf_queue_cancel(&common->buffer_queue);
-                videobuf_mmap_free(&common->buffer_queue);
+                vb2_queue_release(&common->buffer_queue);
+                vb2_dma_contig_cleanup_ctx(common->alloc_ctx);
+
                 common->numbuffers =
                     config_params.numbuffers[ch->channel_id];
         }
@@ -806,6 +923,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
         struct channel_obj *ch = fh->channel;
         struct common_obj *common;
         enum v4l2_field field;
+        struct vb2_queue *q;
         u8 index = 0;
 
         /* This file handle has not initialized the channel,
@@ -825,9 +943,8 @@ static int vpif_reqbufs(struct file *file, void *priv,
 
         common = &ch->common[index];
 
-        if (common->fmt.type != reqbuf->type)
+        if (common->fmt.type != reqbuf->type || !vpif_dev)
                 return -EINVAL;
-
         if (0 != common->io_usrs)
                 return -EBUSY;
 
@@ -839,14 +956,21 @@ static int vpif_reqbufs(struct file *file, void *priv,
         } else {
                 field = V4L2_VBI_INTERLACED;
         }
+        /* Initialize videobuf2 queue as per the buffer type */
+        common->alloc_ctx = vb2_dma_contig_init_ctx(vpif_dev);
+        if (!common->alloc_ctx) {
+                vpif_err("Failed to get the context\n");
+                return -EINVAL;
+        }
+        q = &common->buffer_queue;
+        q->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+        q->io_modes = VB2_MMAP | VB2_USERPTR;
+        q->drv_priv = fh;
+        q->ops = &video_qops;
+        q->mem_ops = &vb2_dma_contig_memops;
+        q->buf_struct_size = sizeof(struct vpif_disp_buffer);
 
-        /* Initialize videobuf queue as per the buffer type */
-        videobuf_queue_dma_contig_init(&common->buffer_queue,
-                                            &video_qops, NULL,
-                                            &common->irqlock,
-                                            reqbuf->type, field,
-                                            sizeof(struct videobuf_buffer), fh,
-                                            &common->lock);
+        vb2_queue_init(q);
 
         /* Set io allowed member of file handle to TRUE */
         fh->io_allowed[index] = 1;
@@ -855,9 +979,8 @@ static int vpif_reqbufs(struct file *file, void *priv,
         /* Store type of memory requested in channel object */
         common->memory = reqbuf->memory;
         INIT_LIST_HEAD(&common->dma_queue);
-
         /* Allocate buffers */
-        return videobuf_reqbufs(&common->buffer_queue, reqbuf);
+        return vb2_reqbufs(&common->buffer_queue, reqbuf);
 }
 
 static int vpif_querybuf(struct file *file, void *priv,
@@ -870,22 +993,25 @@ static int vpif_querybuf(struct file *file, void *priv,
         if (common->fmt.type != tbuf->type)
                 return -EINVAL;
 
-        return videobuf_querybuf(&common->buffer_queue, tbuf);
+        return vb2_querybuf(&common->buffer_queue, tbuf);
 }
 
 static int vpif_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
 {
+        struct vpif_fh *fh = NULL;
+        struct channel_obj *ch = NULL;
+        struct common_obj *common = NULL;
 
-        struct vpif_fh *fh = priv;
-        struct channel_obj *ch = fh->channel;
-        struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
-        struct v4l2_buffer tbuf = *buf;
-        struct videobuf_buffer *buf1;
-        unsigned long addr = 0;
-        unsigned long flags;
-        int ret = 0;
+        if (!buf || !priv)
+                return -EINVAL;
+
+        fh = priv;
+        ch = fh->channel;
+        if (!ch)
+                return -EINVAL;
 
-        if (common->fmt.type != tbuf.type)
+        common = &(ch->common[VPIF_VIDEO_INDEX]);
+        if (common->fmt.type != buf->type)
                 return -EINVAL;
 
         if (!fh->io_allowed[VPIF_VIDEO_INDEX]) {
@@ -893,73 +1019,7 @@ static int vpif_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
                 return -EACCES;
         }
 
-        if (!(list_empty(&common->dma_queue)) ||
-            (common->cur_frm != common->next_frm) ||
-            !(common->started) ||
-            (common->started && (0 == ch->field_id)))
-                return videobuf_qbuf(&common->buffer_queue, buf);
-
-        /* bufferqueue is empty store buffer address in VPIF registers */
-        mutex_lock(&common->buffer_queue.vb_lock);
-        buf1 = common->buffer_queue.bufs[tbuf.index];
-        if (buf1->memory != tbuf.memory) {
-                vpif_err("invalid buffer type\n");
-                goto qbuf_exit;
-        }
-
-        if ((buf1->state == VIDEOBUF_QUEUED) ||
-            (buf1->state == VIDEOBUF_ACTIVE)) {
-                vpif_err("invalid state\n");
-                goto qbuf_exit;
-        }
-
-        switch (buf1->memory) {
-        case V4L2_MEMORY_MMAP:
-                if (buf1->baddr == 0)
-                        goto qbuf_exit;
-                break;
-
-        case V4L2_MEMORY_USERPTR:
-                if (tbuf.length < buf1->bsize)
-                        goto qbuf_exit;
-
-                if ((VIDEOBUF_NEEDS_INIT != buf1->state)
-                            && (buf1->baddr != tbuf.m.userptr)) {
-                        vpif_buffer_release(&common->buffer_queue, buf1);
-                        buf1->baddr = tbuf.m.userptr;
-                }
-                break;
-
-        default:
-                goto qbuf_exit;
-        }
-
-        local_irq_save(flags);
-        ret = vpif_buffer_prepare(&common->buffer_queue, buf1,
-                                        common->buffer_queue.field);
-        if (ret < 0) {
-                local_irq_restore(flags);
-                goto qbuf_exit;
-        }
-
-        buf1->state = VIDEOBUF_ACTIVE;
-        addr = buf1->boff;
-        common->next_frm = buf1;
-        if (tbuf.type != V4L2_BUF_TYPE_SLICED_VBI_OUTPUT) {
-                common->set_addr((addr + common->ytop_off),
-                                 (addr + common->ybtm_off),
-                                 (addr + common->ctop_off),
-                                 (addr + common->cbtm_off));
-        }
-
-        local_irq_restore(flags);
-        list_add_tail(&buf1->stream, &common->buffer_queue.stream);
-        mutex_unlock(&common->buffer_queue.vb_lock);
-        return 0;
-
-qbuf_exit:
-        mutex_unlock(&common->buffer_queue.vb_lock);
-        return -EINVAL;
+        return vb2_qbuf(&common->buffer_queue, buf);
 }
 
 static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
@@ -969,7 +1029,7 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
         struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
         int ret = 0;
 
-        if (!(*std_id & DM646X_V4L2_STD))
+        if (!(*std_id & VPIF_V4L2_STD))
                 return -EINVAL;
 
         if (common->started) {
@@ -1026,7 +1086,7 @@ static int vpif_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
         struct channel_obj *ch = fh->channel;
         struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
 
-        return videobuf_dqbuf(&common->buffer_queue, p,
+        return vb2_dqbuf(&common->buffer_queue, p,
                                         (file->f_flags & O_NONBLOCK));
 }
 
@@ -1037,10 +1097,6 @@ static int vpif_streamon(struct file *file, void *priv,
         struct channel_obj *ch = fh->channel;
         struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
         struct channel_obj *oth_ch = vpif_obj.dev[!ch->channel_id];
-        struct vpif_params *vpif = &ch->vpifparams;
-        struct vpif_display_config *vpif_config_data =
-                                        vpif_dev->platform_data;
-        unsigned long addr = 0;
         int ret = 0;
 
         if (buftype != V4L2_BUF_TYPE_VIDEO_OUTPUT) {
@@ -1072,82 +1128,13 @@ static int vpif_streamon(struct file *file, void *priv,
         if (ret < 0)
                 return ret;
 
-        /* Call videobuf_streamon to start streaming in videobuf */
-        ret = videobuf_streamon(&common->buffer_queue);
+        /* Call vb2_streamon to start streaming in videobuf2 */
+        ret = vb2_streamon(&common->buffer_queue, buftype);
         if (ret < 0) {
-                vpif_err("videobuf_streamon\n");
+                vpif_err("vb2_streamon\n");
                 return ret;
         }
 
-        /* If buffer queue is empty, return error */
-        if (list_empty(&common->dma_queue)) {
-                vpif_err("buffer queue is empty\n");
-                return -EIO;
-        }
-
-        /* Get the next frame from the buffer queue */
-        common->next_frm = common->cur_frm =
-                            list_entry(common->dma_queue.next,
-                                       struct videobuf_buffer, queue);
-
-        list_del(&common->cur_frm->queue);
-        /* Mark state of the current frame to active */
-        common->cur_frm->state = VIDEOBUF_ACTIVE;
-
-        /* Initialize field_id and started member */
-        ch->field_id = 0;
-        common->started = 1;
-        if (buftype == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
-                addr = common->cur_frm->boff;
-                /* Calculate the offset for Y and C data  in the buffer */
-                vpif_calculate_offsets(ch);
-
-                if ((ch->vpifparams.std_info.frm_fmt &&
-                        ((common->fmt.fmt.pix.field != V4L2_FIELD_NONE)
-                        && (common->fmt.fmt.pix.field != V4L2_FIELD_ANY)))
-                        || (!ch->vpifparams.std_info.frm_fmt
-                        && (common->fmt.fmt.pix.field == V4L2_FIELD_NONE))) {
-                        vpif_err("conflict in field format and std format\n");
-                        return -EINVAL;
-                }
-
-                /* clock settings */
-                ret =
-                 vpif_config_data->set_clock(ch->vpifparams.std_info.ycmux_mode,
-                                                ch->vpifparams.std_info.hd_sd);
-                if (ret < 0) {
-                        vpif_err("can't set clock\n");
-                        return ret;
-                }
-
-                /* set the parameters and addresses */
-                ret = vpif_set_video_params(vpif, ch->channel_id + 2);
-                if (ret < 0)
-                        return ret;
-
-                common->started = ret;
-                vpif_config_addr(ch, ret);
-                common->set_addr((addr + common->ytop_off),
-                                 (addr + common->ybtm_off),
-                                 (addr + common->ctop_off),
-                                 (addr + common->cbtm_off));
-
-                /* Set interrupt for both the fields in VPIF
-                   Register enable channel in VPIF register */
-                if (VPIF_CHANNEL2_VIDEO == ch->channel_id) {
-                        channel2_intr_assert();
-                        channel2_intr_enable(1);
-                        enable_channel2(1);
-                }
-
-                if ((VPIF_CHANNEL3_VIDEO == ch->channel_id)
-                        || (common->started == 2)) {
-                        channel3_intr_assert();
-                        channel3_intr_enable(1);
-                        enable_channel3(1);
-                }
-                channel_first_int[VPIF_VIDEO_INDEX][ch->channel_id] = 1;
-        }
         return ret;
 }
 
@@ -1157,6 +1144,8 @@ static int vpif_streamoff(struct file *file, void *priv,
         struct vpif_fh *fh = priv;
         struct channel_obj *ch = fh->channel;
         struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+        struct vpif_display_config *vpif_config_data =
+                                        vpif_dev->platform_data;
 
         if (buftype != V4L2_BUF_TYPE_VIDEO_OUTPUT) {
                 vpif_err("buffer type not supported\n");
@@ -1176,18 +1165,22 @@ static int vpif_streamoff(struct file *file, void *priv,
         if (buftype == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
                 /* disable channel */
                 if (VPIF_CHANNEL2_VIDEO == ch->channel_id) {
+                        if (vpif_config_data->ch2_clip_en)
+                                channel2_clipping_enable(0);
                         enable_channel2(0);
                         channel2_intr_enable(0);
                 }
                 if ((VPIF_CHANNEL3_VIDEO == ch->channel_id) ||
                                         (2 == common->started)) {
+                        if (vpif_config_data->ch3_clip_en)
+                                channel3_clipping_enable(0);
                         enable_channel3(0);
                         channel3_intr_enable(0);
                 }
         }
 
         common->started = 0;
-        return videobuf_streamoff(&common->buffer_queue);
+        return vb2_streamoff(&common->buffer_queue, buftype);
 }
 
 static int vpif_cropcap(struct file *file, void *priv,
@@ -1220,7 +1213,7 @@ static int vpif_enum_output(struct file *file, void *fh,
 
         strcpy(output->name, config->output[output->index]);
         output->type = V4L2_OUTPUT_TYPE_ANALOG;
-        output->std = DM646X_V4L2_STD;
+        output->std = VPIF_V4L2_STD;
 
         return 0;
 }
@@ -1605,7 +1598,7 @@ static struct video_device vpif_video_template = {
         .name           = "vpif",
         .fops           = &vpif_fops,
         .ioctl_ops      = &vpif_ioctl_ops,
-        .tvnorms        = DM646X_V4L2_STD,
+        .tvnorms        = VPIF_V4L2_STD,
         .current_norm   = V4L2_STD_625_50,
 
 };
@@ -1687,9 +1680,9 @@ static __init int vpif_probe(struct platform_device *pdev)
         struct video_device *vfd;
         struct resource *res;
         int subdev_count;
+        size_t size;
 
         vpif_dev = &pdev->dev;
-
         err = initialize_vpif();
 
         if (err) {
@@ -1706,8 +1699,8 @@ static __init int vpif_probe(struct platform_device *pdev)
         k = 0;
         while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, k))) {
                 for (i = res->start; i <= res->end; i++) {
-                        if (request_irq(i, vpif_channel_isr, IRQF_DISABLED,
-                                        "DM646x_Display",
+                        if (request_irq(i, vpif_channel_isr, IRQF_SHARED,
+                                        "VPIF_Display",
                                 (void *)(&vpif_obj.dev[k]->channel_id))) {
                                 err = -EBUSY;
                                 goto vpif_int_err;
@@ -1737,13 +1730,31 @@ static __init int vpif_probe(struct platform_device *pdev)
                 vfd->v4l2_dev = &vpif_obj.v4l2_dev;
                 vfd->release = video_device_release;
                 snprintf(vfd->name, sizeof(vfd->name),
-                         "DM646x_VPIFDisplay_DRIVER_V%s",
+                         "VPIF_Display_DRIVER_V%s",
                          VPIF_DISPLAY_VERSION);
 
                 /* Set video_dev to the video device */
                 ch->video_dev = vfd;
         }
 
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (res) {
+                size = resource_size(res);
+                /* The resources are divided into two equal memory and when
+                 * we have HD output we can add them together
+                 */
+                for (j = 0; j < VPIF_DISPLAY_MAX_DEVICES; j++) {
+                        ch = vpif_obj.dev[j];
+                        ch->channel_id = j;
+
+                        /* only enabled if second resource exists */
+                        config_params.video_limit[ch->channel_id] = 0;
+                        if (size)
+                                config_params.video_limit[ch->channel_id] =
+                                                                        size/2;
+                }
+        }
+
         for (j = 0; j < VPIF_DISPLAY_MAX_DEVICES; j++) {
                 ch = vpif_obj.dev[j];
                 /* Initialize field of the channel objects */
@@ -1823,7 +1834,7 @@ static __init int vpif_probe(struct platform_device *pdev)
         }
 
         v4l2_info(&vpif_obj.v4l2_dev,
-                        "DM646x VPIF display driver initialized\n");
+                        " VPIF display driver initialized\n");
         return 0;
 
 probe_subdev_out:
@@ -1871,10 +1882,81 @@ static int vpif_remove(struct platform_device *device)
         return 0;
 }
 
+#ifdef CONFIG_PM
+static int vpif_suspend(struct device *dev)
+{
+        struct common_obj *common;
+        struct channel_obj *ch;
+        int i;
+
+        for (i = 0; i < VPIF_DISPLAY_MAX_DEVICES; i++) {
+                /* Get the pointer to the channel object */
+                ch = vpif_obj.dev[i];
+                common = &ch->common[VPIF_VIDEO_INDEX];
+                mutex_lock(&common->lock);
+                if (atomic_read(&ch->usrs) && common->io_usrs) {
+                        /* Disable channel */
+                        if (ch->channel_id == VPIF_CHANNEL2_VIDEO) {
+                                enable_channel2(0);
+                                channel2_intr_enable(0);
+                        }
+                        if (ch->channel_id == VPIF_CHANNEL3_VIDEO ||
+                                        common->started == 2) {
+                                enable_channel3(0);
+                                channel3_intr_enable(0);
+                        }
+                }
+                mutex_unlock(&common->lock);
+        }
+
+        return 0;
+}
+
+static int vpif_resume(struct device *dev)
+{
+
+        struct common_obj *common;
+        struct channel_obj *ch;
+        int i;
+
+        for (i = 0; i < VPIF_DISPLAY_MAX_DEVICES; i++) {
+                /* Get the pointer to the channel object */
+                ch = vpif_obj.dev[i];
+                common = &ch->common[VPIF_VIDEO_INDEX];
+                mutex_lock(&common->lock);
+                if (atomic_read(&ch->usrs) && common->io_usrs) {
+                        /* Enable channel */
+                        if (ch->channel_id == VPIF_CHANNEL2_VIDEO) {
+                                enable_channel2(1);
+                                channel2_intr_enable(1);
+                        }
+                        if (ch->channel_id == VPIF_CHANNEL3_VIDEO ||
+                                        common->started == 2) {
+                                enable_channel3(1);
+                                channel3_intr_enable(1);
+                        }
+                }
+                mutex_unlock(&common->lock);
+        }
+
+        return 0;
+}
+
+static const struct dev_pm_ops vpif_pm = {
+        .suspend        = vpif_suspend,
+        .resume         = vpif_resume,
+};
+
+#define vpif_pm_ops (&vpif_pm)
+#else
+#define vpif_pm_ops NULL
+#endif
+
 static __refdata struct platform_driver vpif_driver = {
         .driver = {
                         .name   = "vpif_display",
                         .owner  = THIS_MODULE,
+                        .pm     = vpif_pm_ops,
         },
         .probe  = vpif_probe,
         .remove = vpif_remove,
diff --git a/drivers/media/video/davinci/vpif_display.h b/drivers/media/video/davinci/vpif_display.h
index 56879d1a0684..8967ffb44058 100644
--- a/drivers/media/video/davinci/vpif_display.h
+++ b/drivers/media/video/davinci/vpif_display.h
@@ -1,5 +1,5 @@
 /*
- * DM646x display header file
+ * VPIF display header file
  *
  * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/
  *
@@ -21,7 +21,7 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-device.h>
 #include <media/videobuf-core.h>
-#include <media/videobuf-dma-contig.h>
+#include <media/videobuf2-dma-contig.h>
 #include <media/davinci/vpif_types.h>
 
 #include "vpif.h"
@@ -73,21 +73,29 @@ struct vbi_obj {
                                                  * vbi data */
 };
 
+struct vpif_disp_buffer {
+        struct vb2_buffer vb;
+        struct list_head list;
+};
+
 struct common_obj {
         /* Buffer specific parameters */
         u8 *fbuffers[VIDEO_MAX_FRAME];          /* List of buffer pointers for
                                                  * storing frames */
         u32 numbuffers;                         /* number of buffers */
-        struct videobuf_buffer *cur_frm;        /* Pointer pointing to current
-                                                 * videobuf_buffer */
-        struct videobuf_buffer *next_frm;       /* Pointer pointing to next
-                                                 * videobuf_buffer */
+        struct vpif_disp_buffer *cur_frm;       /* Pointer pointing to current
+                                                 * vb2_buffer */
+        struct vpif_disp_buffer *next_frm;      /* Pointer pointing to next
+                                                 * vb2_buffer */
         enum v4l2_memory memory;                /* This field keeps track of
                                                  * type of buffer exchange
                                                  * method user has selected */
         struct v4l2_format fmt;                 /* Used to store the format */
-        struct videobuf_queue buffer_queue;     /* Buffer queue used in
+        struct vb2_queue buffer_queue;          /* Buffer queue used in
                                                  * video-buf */
+        /* allocator-specific contexts for each plane */
+        struct vb2_alloc_ctx *alloc_ctx;
+
         struct list_head dma_queue;             /* Queue of filled frames */
         spinlock_t irqlock;                     /* Used in video-buf */
 
@@ -158,6 +166,7 @@ struct vpif_config_params {
         u32 min_bufsize[VPIF_DISPLAY_NUM_CHANNELS];
         u32 channel_bufsize[VPIF_DISPLAY_NUM_CHANNELS];
         u8 numbuffers[VPIF_DISPLAY_NUM_CHANNELS];
+        u32 video_limit[VPIF_DISPLAY_NUM_CHANNELS];
         u8 min_numbuffers;
 };
 
diff --git a/drivers/media/video/gspca/benq.c b/drivers/media/video/gspca/benq.c
index 9769f17915c0..352f32190e68 100644
--- a/drivers/media/video/gspca/benq.c
+++ b/drivers/media/video/gspca/benq.c
@@ -33,10 +33,6 @@ struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
 };
 
-/* V4L2 controls supported by the driver */
-static const struct ctrl sd_ctrls[] = {
-};
-
 static const struct v4l2_pix_format vga_mode[] = {
         {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 320,
@@ -256,8 +252,6 @@ static void sd_isoc_irq(struct urb *urb)
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
         .start = sd_start,
@@ -288,6 +282,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c
index f39fee0fd10f..c9052f20435e 100644
--- a/drivers/media/video/gspca/conex.c
+++ b/drivers/media/video/gspca/conex.c
@@ -31,74 +31,18 @@ MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA USB Conexant Camera Driver");
 MODULE_LICENSE("GPL");
 
+#define QUALITY 50
+
 /* specific webcam descriptor */
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
-
-        unsigned char brightness;
-        unsigned char contrast;
-        unsigned char colors;
-        u8 quality;
-#define QUALITY_MIN 30
-#define QUALITY_MAX 60
-#define QUALITY_DEF 40
+        struct v4l2_ctrl *brightness;
+        struct v4l2_ctrl *contrast;
+        struct v4l2_ctrl *sat;
 
         u8 jpeg_hdr[JPEG_HDR_SZ];
 };
 
-/* V4L2 controls supported by the driver */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);
-
-static const struct ctrl sd_ctrls[] = {
-        {
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-#define BRIGHTNESS_DEF 0xd4
-                .default_value = BRIGHTNESS_DEF,
-            },
-            .set = sd_setbrightness,
-            .get = sd_getbrightness,
-        },
-        {
-            {
-                .id      = V4L2_CID_CONTRAST,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Contrast",
-                .minimum = 0x0a,
-                .maximum = 0x1f,
-                .step    = 1,
-#define CONTRAST_DEF 0x0c
-                .default_value = CONTRAST_DEF,
-            },
-            .set = sd_setcontrast,
-            .get = sd_getcontrast,
-        },
-        {
-            {
-                .id      = V4L2_CID_SATURATION,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Color",
-                .minimum = 0,
-                .maximum = 7,
-                .step    = 1,
-#define COLOR_DEF 3
-                .default_value = COLOR_DEF,
-            },
-            .set = sd_setcolors,
-            .get = sd_getcolors,
-        },
-};
-
 static const struct v4l2_pix_format vga_mode[] = {
         {176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 176,
@@ -817,17 +761,11 @@ static void cx11646_init1(struct gspca_dev *gspca_dev)
 static int sd_config(struct gspca_dev *gspca_dev,
                         const struct usb_device_id *id)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
 
         cam = &gspca_dev->cam;
         cam->cam_mode = vga_mode;
         cam->nmodes = ARRAY_SIZE(vga_mode);
-
-        sd->brightness = BRIGHTNESS_DEF;
-        sd->contrast = CONTRAST_DEF;
-        sd->colors = COLOR_DEF;
-        sd->quality = QUALITY_DEF;
         return 0;
 }
 
@@ -849,7 +787,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
         /* create the JPEG header */
         jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width,
                         0x22);          /* JPEG 411 */
-        jpeg_set_qual(sd->jpeg_hdr, sd->quality);
+        jpeg_set_qual(sd->jpeg_hdr, QUALITY);
 
         cx11646_initsize(gspca_dev);
         cx11646_fw(gspca_dev);
@@ -903,142 +841,99 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 val, s32 sat)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         __u8 regE5cbx[] = { 0x88, 0x00, 0xd4, 0x01, 0x88, 0x01, 0x01, 0x01 };
         __u8 reg51c[2];
-        __u8 bright;
-        __u8 colors;
 
-        bright = sd->brightness;
-        regE5cbx[2] = bright;
+        regE5cbx[2] = val;
         reg_w(gspca_dev, 0x00e5, regE5cbx, 8);
         reg_r(gspca_dev, 0x00e8, 8);
         reg_w(gspca_dev, 0x00e5, regE5c, 4);
         reg_r(gspca_dev, 0x00e8, 1);            /* 0x00 */
 
-        colors = sd->colors;
         reg51c[0] = 0x77;
-        reg51c[1] = colors;
+        reg51c[1] = sat;
         reg_w(gspca_dev, 0x0051, reg51c, 2);
         reg_w(gspca_dev, 0x0010, reg10, 2);
         reg_w_val(gspca_dev, 0x0070, reg70);
 }
 
-static void setcontrast(struct gspca_dev *gspca_dev)
+static void setcontrast(struct gspca_dev *gspca_dev, s32 val, s32 sat)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         __u8 regE5acx[] = { 0x88, 0x0a, 0x0c, 0x01 };   /* seem MSB */
 /*      __u8 regE5bcx[] = { 0x88, 0x0b, 0x12, 0x01};     * LSB */
         __u8 reg51c[2];
 
-        regE5acx[2] = sd->contrast;
+        regE5acx[2] = val;
         reg_w(gspca_dev, 0x00e5, regE5acx, 4);
         reg_r(gspca_dev, 0x00e8, 1);            /* 0x00 */
         reg51c[0] = 0x77;
-        reg51c[1] = sd->colors;
+        reg51c[1] = sat;
         reg_w(gspca_dev, 0x0051, reg51c, 2);
         reg_w(gspca_dev, 0x0010, reg10, 2);
         reg_w_val(gspca_dev, 0x0070, reg70);
 }
 
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->brightness = val;
-        if (gspca_dev->streaming)
-                setbrightness(gspca_dev);
-        return 0;
-}
-
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->brightness;
-        return 0;
-}
-
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->contrast = val;
-        if (gspca_dev->streaming)
-                setcontrast(gspca_dev);
-        return 0;
-}
-
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
 
-        *val = sd->contrast;
-        return 0;
-}
+        gspca_dev->usb_err = 0;
 
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        if (!gspca_dev->streaming)
+                return 0;
 
-        sd->colors = val;
-        if (gspca_dev->streaming) {
-                setbrightness(gspca_dev);
-                setcontrast(gspca_dev);
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val, sd->sat->cur.val);
+                break;
+        case V4L2_CID_CONTRAST:
+                setcontrast(gspca_dev, ctrl->val, sd->sat->cur.val);
+                break;
+        case V4L2_CID_SATURATION:
+                setbrightness(gspca_dev, sd->brightness->cur.val, ctrl->val);
+                setcontrast(gspca_dev, sd->contrast->cur.val, ctrl->val);
+                break;
         }
-        return 0;
+        return gspca_dev->usb_err;
 }
 
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->colors;
-        return 0;
-}
-
-static int sd_set_jcomp(struct gspca_dev *gspca_dev,
-                        struct v4l2_jpegcompression *jcomp)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        if (jcomp->quality < QUALITY_MIN)
-                sd->quality = QUALITY_MIN;
-        else if (jcomp->quality > QUALITY_MAX)
-                sd->quality = QUALITY_MAX;
-        else
-                sd->quality = jcomp->quality;
-        if (gspca_dev->streaming)
-                jpeg_set_qual(sd->jpeg_hdr, sd->quality);
-        return 0;
-}
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
 
-static int sd_get_jcomp(struct gspca_dev *gspca_dev,
-                        struct v4l2_jpegcompression *jcomp)
+static int sd_init_controls(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        memset(jcomp, 0, sizeof *jcomp);
-        jcomp->quality = sd->quality;
-        jcomp->jpeg_markers = V4L2_JPEG_MARKER_DHT
-                        | V4L2_JPEG_MARKER_DQT;
+        struct sd *sd = (struct sd *)gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 3);
+        sd->brightness = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 255, 1, 0xd4);
+        sd->contrast = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0x0a, 0x1f, 1, 0x0c);
+        sd->sat = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SATURATION, 0, 7, 1, 3);
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
         return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stop0 = sd_stop0,
         .pkt_scan = sd_pkt_scan,
-        .get_jcomp = sd_get_jcomp,
-        .set_jcomp = sd_set_jcomp,
 };
 
 /* -- module initialisation -- */
@@ -1064,6 +959,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/cpia1.c b/drivers/media/video/gspca/cpia1.c
index 8f33bbd091ad..2499a881d9a3 100644
--- a/drivers/media/video/gspca/cpia1.c
+++ b/drivers/media/video/gspca/cpia1.c
@@ -225,6 +225,15 @@ MODULE_LICENSE("GPL");
 #define FIRMWARE_VERSION(x, y) (sd->params.version.firmwareVersion == (x) && \
                                 sd->params.version.firmwareRevision == (y))
 
+#define CPIA1_CID_COMP_TARGET (V4L2_CTRL_CLASS_USER + 0x1000)
+#define BRIGHTNESS_DEF 50
+#define CONTRAST_DEF 48
+#define SATURATION_DEF 50
+#define FREQ_DEF V4L2_CID_POWER_LINE_FREQUENCY_50HZ
+#define ILLUMINATORS_1_DEF 0
+#define ILLUMINATORS_2_DEF 0
+#define COMP_TARGET_DEF CPIA_COMPRESSION_TARGET_QUALITY
+
 /* Developer's Guide Table 5 p 3-34
  * indexed by [mains][sensorFps.baserate][sensorFps.divisor]*/
 static u8 flicker_jumps[2][2][4] =
@@ -360,135 +369,9 @@ struct sd {
         atomic_t fps;
         int exposure_count;
         u8 exposure_status;
+        struct v4l2_ctrl *freq;
         u8 mainsFreq;                           /* 0 = 50hz, 1 = 60hz */
         u8 first_frame;
-        u8 freq;
-};
-
-/* V4L2 controls supported by the driver */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setsaturation(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getsaturation(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setfreq(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcomptarget(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcomptarget(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setilluminator1(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getilluminator1(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setilluminator2(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getilluminator2(struct gspca_dev *gspca_dev, __s32 *val);
-
-static const struct ctrl sd_ctrls[] = {
-        {
-#define BRIGHTNESS_IDX 0
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-                .maximum = 100,
-                .step = 1,
-#define BRIGHTNESS_DEF 50
-                .default_value = BRIGHTNESS_DEF,
-                .flags = 0,
-            },
-            .set = sd_setbrightness,
-            .get = sd_getbrightness,
-        },
-#define CONTRAST_IDX 1
-        {
-            {
-                .id      = V4L2_CID_CONTRAST,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Contrast",
-                .minimum = 0,
-                .maximum = 96,
-                .step    = 8,
-#define CONTRAST_DEF 48
-                .default_value = CONTRAST_DEF,
-            },
-            .set = sd_setcontrast,
-            .get = sd_getcontrast,
-        },
-#define SATURATION_IDX 2
-        {
-            {
-                .id      = V4L2_CID_SATURATION,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Saturation",
-                .minimum = 0,
-                .maximum = 100,
-                .step    = 1,
-#define SATURATION_DEF 50
-                .default_value = SATURATION_DEF,
-            },
-            .set = sd_setsaturation,
-            .get = sd_getsaturation,
-        },
-#define POWER_LINE_FREQUENCY_IDX 3
-        {
-                {
-                        .id      = V4L2_CID_POWER_LINE_FREQUENCY,
-                        .type    = V4L2_CTRL_TYPE_MENU,
-                        .name    = "Light frequency filter",
-                        .minimum = 0,
-                        .maximum = 2,   /* 0: 0, 1: 50Hz, 2:60Hz */
-                        .step    = 1,
-#define FREQ_DEF 1
-                        .default_value = FREQ_DEF,
-                },
-                .set = sd_setfreq,
-                .get = sd_getfreq,
-        },
-#define ILLUMINATORS_1_IDX 4
-        {
-                {
-                        .id      = V4L2_CID_ILLUMINATORS_1,
-                        .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name    = "Illuminator 1",
-                        .minimum = 0,
-                        .maximum = 1,
-                        .step    = 1,
-#define ILLUMINATORS_1_DEF 0
-                        .default_value = ILLUMINATORS_1_DEF,
-                },
-                .set = sd_setilluminator1,
-                .get = sd_getilluminator1,
-        },
-#define ILLUMINATORS_2_IDX 5
-        {
-                {
-                        .id      = V4L2_CID_ILLUMINATORS_2,
-                        .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name    = "Illuminator 2",
-                        .minimum = 0,
-                        .maximum = 1,
-                        .step    = 1,
-#define ILLUMINATORS_2_DEF 0
-                        .default_value = ILLUMINATORS_2_DEF,
-                },
-                .set = sd_setilluminator2,
-                .get = sd_getilluminator2,
-        },
-#define COMP_TARGET_IDX 6
-        {
-                {
-#define V4L2_CID_COMP_TARGET V4L2_CID_PRIVATE_BASE
-                        .id      = V4L2_CID_COMP_TARGET,
-                        .type    = V4L2_CTRL_TYPE_MENU,
-                        .name    = "Compression Target",
-                        .minimum = 0,
-                        .maximum = 1,
-                        .step    = 1,
-#define COMP_TARGET_DEF CPIA_COMPRESSION_TARGET_QUALITY
-                        .default_value = COMP_TARGET_DEF,
-                },
-                .set = sd_setcomptarget,
-                .get = sd_getcomptarget,
-        },
 };
 
 static const struct v4l2_pix_format mode[] = {
@@ -770,15 +653,6 @@ static void reset_camera_params(struct gspca_dev *gspca_dev)
         params->apcor.gain2 = 0x16;
         params->apcor.gain4 = 0x24;
         params->apcor.gain8 = 0x34;
-        params->flickerControl.flickerMode = 0;
-        params->flickerControl.disabled = 1;
-
-        params->flickerControl.coarseJump =
-                flicker_jumps[sd->mainsFreq]
-                             [params->sensorFps.baserate]
-                             [params->sensorFps.divisor];
-        params->flickerControl.allowableOverExposure =
-                find_over_exposure(params->colourParams.brightness);
         params->vlOffset.gain1 = 20;
         params->vlOffset.gain2 = 24;
         params->vlOffset.gain4 = 26;
@@ -798,6 +672,15 @@ static void reset_camera_params(struct gspca_dev *gspca_dev)
         params->sensorFps.divisor = 1;
         params->sensorFps.baserate = 1;
 
+        params->flickerControl.flickerMode = 0;
+        params->flickerControl.disabled = 1;
+        params->flickerControl.coarseJump =
+                flicker_jumps[sd->mainsFreq]
+                             [params->sensorFps.baserate]
+                             [params->sensorFps.divisor];
+        params->flickerControl.allowableOverExposure =
+                find_over_exposure(params->colourParams.brightness);
+
         params->yuvThreshold.yThreshold = 6; /* From windows driver */
         params->yuvThreshold.uvThreshold = 6; /* From windows driver */
 
@@ -1110,9 +993,6 @@ static int command_setlights(struct gspca_dev *gspca_dev)
         struct sd *sd = (struct sd *) gspca_dev;
         int ret, p1, p2;
 
-        if (!sd->params.qx3.qx3_detected)
-                return 0;
-
         p1 = (sd->params.qx3.bottomlight == 0) << 1;
         p2 = (sd->params.qx3.toplight == 0) << 3;
 
@@ -1551,8 +1431,10 @@ static void restart_flicker(struct gspca_dev *gspca_dev)
 static int sd_config(struct gspca_dev *gspca_dev,
                         const struct usb_device_id *id)
 {
+        struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
 
+        sd->mainsFreq = FREQ_DEF == V4L2_CID_POWER_LINE_FREQUENCY_60HZ;
         reset_camera_params(gspca_dev);
 
         PDEBUG(D_PROBE, "cpia CPiA camera detected (vid/pid 0x%04X:0x%04X)",
@@ -1562,8 +1444,25 @@ static int sd_config(struct gspca_dev *gspca_dev,
         cam->cam_mode = mode;
         cam->nmodes = ARRAY_SIZE(mode);
 
-        sd_setfreq(gspca_dev, FREQ_DEF);
+        goto_low_power(gspca_dev);
+        /* Check the firmware version. */
+        sd->params.version.firmwareVersion = 0;
+        get_version_information(gspca_dev);
+        if (sd->params.version.firmwareVersion != 1) {
+                PDEBUG(D_ERR, "only firmware version 1 is supported (got: %d)",
+                       sd->params.version.firmwareVersion);
+                return -ENODEV;
+        }
 
+        /* A bug in firmware 1-02 limits gainMode to 2 */
+        if (sd->params.version.firmwareRevision <= 2 &&
+            sd->params.exposure.gainMode > 2) {
+                sd->params.exposure.gainMode = 2;
+        }
+
+        /* set QX3 detected flag */
+        sd->params.qx3.qx3_detected = (sd->params.pnpID.vendor == 0x0813 &&
+                                       sd->params.pnpID.product == 0x0001);
         return 0;
 }
 
@@ -1602,21 +1501,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
         /* Check the firmware version. */
         sd->params.version.firmwareVersion = 0;
         get_version_information(gspca_dev);
-        if (sd->params.version.firmwareVersion != 1) {
-                PDEBUG(D_ERR, "only firmware version 1 is supported (got: %d)",
-                       sd->params.version.firmwareVersion);
-                return -ENODEV;
-        }
-
-        /* A bug in firmware 1-02 limits gainMode to 2 */
-        if (sd->params.version.firmwareRevision <= 2 &&
-            sd->params.exposure.gainMode > 2) {
-                sd->params.exposure.gainMode = 2;
-        }
-
-        /* set QX3 detected flag */
-        sd->params.qx3.qx3_detected = (sd->params.pnpID.vendor == 0x0813 &&
-                                       sd->params.pnpID.product == 0x0001);
 
         /* The fatal error checking should be done after
          * the camera powers up (developer's guide p 3-38) */
@@ -1785,9 +1669,6 @@ static int sd_init(struct gspca_dev *gspca_dev)
            or disable the illuminator controls, if this isn't a QX3 */
         if (sd->params.qx3.qx3_detected)
                 command_setlights(gspca_dev);
-        else
-                gspca_dev->ctrl_dis |=
-                        ((1 << ILLUMINATORS_1_IDX) | (1 << ILLUMINATORS_2_IDX));
 
         sd_stopN(gspca_dev);
 
@@ -1871,235 +1752,123 @@ static void sd_dq_callback(struct gspca_dev *gspca_dev)
         do_command(gspca_dev, CPIA_COMMAND_ReadMCPorts, 0, 0, 0, 0);
 }
 
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-        int ret;
-
-        sd->params.colourParams.brightness = val;
-        sd->params.flickerControl.allowableOverExposure =
-                find_over_exposure(sd->params.colourParams.brightness);
-        if (gspca_dev->streaming) {
-                ret = command_setcolourparams(gspca_dev);
-                if (ret)
-                        return ret;
-                return command_setflickerctrl(gspca_dev);
-        }
-        return 0;
-}
-
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->params.colourParams.brightness;
-        return 0;
-}
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
 
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        gspca_dev->usb_err = 0;
 
-        sd->params.colourParams.contrast = val;
-        if (gspca_dev->streaming)
-                return command_setcolourparams(gspca_dev);
-
-        return 0;
-}
-
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->params.colourParams.contrast;
-        return 0;
-}
-
-static int sd_setsaturation(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->params.colourParams.saturation = val;
-        if (gspca_dev->streaming)
-                return command_setcolourparams(gspca_dev);
-
-        return 0;
-}
-
-static int sd_getsaturation(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->params.colourParams.saturation;
-        return 0;
-}
-
-static int sd_setfreq(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-        int on;
+        if (!gspca_dev->streaming && ctrl->id != V4L2_CID_POWER_LINE_FREQUENCY)
+                return 0;
 
-        switch (val) {
-        case 0:         /* V4L2_CID_POWER_LINE_FREQUENCY_DISABLED */
-                on = 0;
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                sd->params.colourParams.brightness = ctrl->val;
+                sd->params.flickerControl.allowableOverExposure =
+                        find_over_exposure(sd->params.colourParams.brightness);
+                gspca_dev->usb_err = command_setcolourparams(gspca_dev);
+                if (!gspca_dev->usb_err)
+                        gspca_dev->usb_err = command_setflickerctrl(gspca_dev);
                 break;
-        case 1:         /* V4L2_CID_POWER_LINE_FREQUENCY_50HZ */
-                on = 1;
-                sd->mainsFreq = 0;
+        case V4L2_CID_CONTRAST:
+                sd->params.colourParams.contrast = ctrl->val;
+                gspca_dev->usb_err = command_setcolourparams(gspca_dev);
                 break;
-        case 2:         /* V4L2_CID_POWER_LINE_FREQUENCY_60HZ */
-                on = 1;
-                sd->mainsFreq = 1;
+        case V4L2_CID_SATURATION:
+                sd->params.colourParams.saturation = ctrl->val;
+                gspca_dev->usb_err = command_setcolourparams(gspca_dev);
                 break;
-        default:
-                return -EINVAL;
-        }
-
-        sd->freq = val;
-        sd->params.flickerControl.coarseJump =
-                flicker_jumps[sd->mainsFreq]
-                             [sd->params.sensorFps.baserate]
-                             [sd->params.sensorFps.divisor];
-
-        return set_flicker(gspca_dev, on, gspca_dev->streaming);
-}
-
-static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->freq;
-        return 0;
-}
-
-static int sd_setcomptarget(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->params.compressionTarget.frTargeting = val;
-        if (gspca_dev->streaming)
-                return command_setcompressiontarget(gspca_dev);
-
-        return 0;
-}
-
-static int sd_getcomptarget(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->params.compressionTarget.frTargeting;
-        return 0;
-}
-
-static int sd_setilluminator(struct gspca_dev *gspca_dev, __s32 val, int n)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-        int ret;
-
-        if (!sd->params.qx3.qx3_detected)
-                return -EINVAL;
-
-        switch (n) {
-        case 1:
-                sd->params.qx3.bottomlight = val ? 1 : 0;
+        case V4L2_CID_POWER_LINE_FREQUENCY:
+                sd->mainsFreq = ctrl->val == V4L2_CID_POWER_LINE_FREQUENCY_60HZ;
+                sd->params.flickerControl.coarseJump =
+                        flicker_jumps[sd->mainsFreq]
+                        [sd->params.sensorFps.baserate]
+                        [sd->params.sensorFps.divisor];
+
+                gspca_dev->usb_err = set_flicker(gspca_dev,
+                        ctrl->val != V4L2_CID_POWER_LINE_FREQUENCY_DISABLED,
+                        gspca_dev->streaming);
                 break;
-        case 2:
-                sd->params.qx3.toplight = val ? 1 : 0;
+        case V4L2_CID_ILLUMINATORS_1:
+                sd->params.qx3.bottomlight = ctrl->val;
+                gspca_dev->usb_err = command_setlights(gspca_dev);
                 break;
-        default:
-                return -EINVAL;
-        }
-
-        ret = command_setlights(gspca_dev);
-        if (ret && ret != -EINVAL)
-                ret = -EBUSY;
-
-        return ret;
-}
-
-static int sd_setilluminator1(struct gspca_dev *gspca_dev, __s32 val)
-{
-        return sd_setilluminator(gspca_dev, val, 1);
-}
-
-static int sd_setilluminator2(struct gspca_dev *gspca_dev, __s32 val)
-{
-        return sd_setilluminator(gspca_dev, val, 2);
-}
-
-static int sd_getilluminator(struct gspca_dev *gspca_dev, __s32 *val, int n)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        if (!sd->params.qx3.qx3_detected)
-                return -EINVAL;
-
-        switch (n) {
-        case 1:
-                *val = sd->params.qx3.bottomlight;
+        case V4L2_CID_ILLUMINATORS_2:
+                sd->params.qx3.toplight = ctrl->val;
+                gspca_dev->usb_err = command_setlights(gspca_dev);
                 break;
-        case 2:
-                *val = sd->params.qx3.toplight;
+        case CPIA1_CID_COMP_TARGET:
+                sd->params.compressionTarget.frTargeting = ctrl->val;
+                gspca_dev->usb_err = command_setcompressiontarget(gspca_dev);
                 break;
-        default:
-                return -EINVAL;
         }
-        return 0;
+        return gspca_dev->usb_err;
 }
 
-static int sd_getilluminator1(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        return sd_getilluminator(gspca_dev, val, 1);
-}
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
 
-static int sd_getilluminator2(struct gspca_dev *gspca_dev, __s32 *val)
+static int sd_init_controls(struct gspca_dev *gspca_dev)
 {
-        return sd_getilluminator(gspca_dev, val, 2);
-}
+        struct sd *sd = (struct sd *)gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+        static const char * const comp_target_menu[] = {
+                "Quality",
+                "Framerate",
+                NULL
+        };
+        static const struct v4l2_ctrl_config comp_target = {
+                .ops = &sd_ctrl_ops,
+                .id = CPIA1_CID_COMP_TARGET,
+                .type = V4L2_CTRL_TYPE_MENU,
+                .name = "Compression Target",
+                .qmenu = comp_target_menu,
+                .max = 1,
+                .def = COMP_TARGET_DEF,
+        };
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 7);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 100, 1, BRIGHTNESS_DEF);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, 96, 8, CONTRAST_DEF);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SATURATION, 0, 100, 1, SATURATION_DEF);
+        sd->freq = v4l2_ctrl_new_std_menu(hdl, &sd_ctrl_ops,
+                        V4L2_CID_POWER_LINE_FREQUENCY,
+                        V4L2_CID_POWER_LINE_FREQUENCY_60HZ, 0,
+                        FREQ_DEF);
+        if (sd->params.qx3.qx3_detected) {
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                V4L2_CID_ILLUMINATORS_1, 0, 1, 1,
+                                ILLUMINATORS_1_DEF);
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                V4L2_CID_ILLUMINATORS_2, 0, 1, 1,
+                                ILLUMINATORS_2_DEF);
+        }
+        v4l2_ctrl_new_custom(hdl, &comp_target, NULL);
 
-static int sd_querymenu(struct gspca_dev *gspca_dev,
-                        struct v4l2_querymenu *menu)
-{
-        switch (menu->id) {
-        case V4L2_CID_POWER_LINE_FREQUENCY:
-                switch (menu->index) {
-                case 0:         /* V4L2_CID_POWER_LINE_FREQUENCY_DISABLED */
-                        strcpy((char *) menu->name, "NoFliker");
-                        return 0;
-                case 1:         /* V4L2_CID_POWER_LINE_FREQUENCY_50HZ */
-                        strcpy((char *) menu->name, "50 Hz");
-                        return 0;
-                case 2:         /* V4L2_CID_POWER_LINE_FREQUENCY_60HZ */
-                        strcpy((char *) menu->name, "60 Hz");
-                        return 0;
-                }
-                break;
-        case V4L2_CID_COMP_TARGET:
-                switch (menu->index) {
-                case CPIA_COMPRESSION_TARGET_QUALITY:
-                        strcpy((char *) menu->name, "Quality");
-                        return 0;
-                case CPIA_COMPRESSION_TARGET_FRAMERATE:
-                        strcpy((char *) menu->name, "Framerate");
-                        return 0;
-                }
-                break;
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
         }
-        return -EINVAL;
+        return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
         .dq_callback = sd_dq_callback,
         .pkt_scan = sd_pkt_scan,
-        .querymenu = sd_querymenu,
 #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
         .other_input = 1,
 #endif
@@ -2129,6 +1898,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c
index 81a4adbd9f7c..38f68e11c3a2 100644
--- a/drivers/media/video/gspca/etoms.c
+++ b/drivers/media/video/gspca/etoms.c
@@ -32,9 +32,6 @@ MODULE_LICENSE("GPL");
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
 
-        unsigned char brightness;
-        unsigned char contrast;
-        unsigned char colors;
         unsigned char autogain;
 
         char sensor;
@@ -44,76 +41,6 @@ struct sd {
 #define AG_CNT_START 13
 };
 
-/* V4L2 controls supported by the driver */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val);
-
-static const struct ctrl sd_ctrls[] = {
-        {
-         {
-          .id = V4L2_CID_BRIGHTNESS,
-          .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Brightness",
-          .minimum = 1,
-          .maximum = 127,
-          .step = 1,
-#define BRIGHTNESS_DEF 63
-          .default_value = BRIGHTNESS_DEF,
-          },
-         .set = sd_setbrightness,
-         .get = sd_getbrightness,
-         },
-        {
-         {
-          .id = V4L2_CID_CONTRAST,
-          .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Contrast",
-          .minimum = 0,
-          .maximum = 255,
-          .step = 1,
-#define CONTRAST_DEF 127
-          .default_value = CONTRAST_DEF,
-          },
-         .set = sd_setcontrast,
-         .get = sd_getcontrast,
-         },
-#define COLOR_IDX 2
-        {
-         {
-          .id = V4L2_CID_SATURATION,
-          .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Color",
-          .minimum = 0,
-          .maximum = 15,
-          .step = 1,
-#define COLOR_DEF 7
-          .default_value = COLOR_DEF,
-          },
-         .set = sd_setcolors,
-         .get = sd_getcolors,
-         },
-        {
-         {
-          .id = V4L2_CID_AUTOGAIN,
-          .type = V4L2_CTRL_TYPE_BOOLEAN,
-          .name = "Auto Gain",
-          .minimum = 0,
-          .maximum = 1,
-          .step = 1,
-#define AUTOGAIN_DEF 1
-          .default_value = AUTOGAIN_DEF,
-          },
-         .set = sd_setautogain,
-         .get = sd_getautogain,
-         },
-};
-
 static const struct v4l2_pix_format vga_mode[] = {
         {320, 240, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
                 .bytesperline = 320,
@@ -464,36 +391,31 @@ static void Et_init2(struct gspca_dev *gspca_dev)
         reg_w_val(gspca_dev, 0x80, 0x20);       /* 0x20; */
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         int i;
-        __u8 brightness = sd->brightness;
 
         for (i = 0; i < 4; i++)
-                reg_w_val(gspca_dev, ET_O_RED + i, brightness);
+                reg_w_val(gspca_dev, ET_O_RED + i, val);
 }
 
-static void setcontrast(struct gspca_dev *gspca_dev)
+static void setcontrast(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         __u8 RGBG[] = { 0x80, 0x80, 0x80, 0x80, 0x00, 0x00 };
-        __u8 contrast = sd->contrast;
 
-        memset(RGBG, contrast, sizeof(RGBG) - 2);
+        memset(RGBG, val, sizeof(RGBG) - 2);
         reg_w(gspca_dev, ET_G_RED, RGBG, 6);
 }
 
-static void setcolors(struct gspca_dev *gspca_dev)
+static void setcolors(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         __u8 I2cc[] = { 0x05, 0x02, 0x02, 0x05, 0x0d };
         __u8 i2cflags = 0x01;
         /* __u8 green = 0; */
-        __u8 colors = sd->colors;
 
-        I2cc[3] = colors;       /* red */
-        I2cc[0] = 15 - colors;  /* blue */
+        I2cc[3] = val;  /* red */
+        I2cc[0] = 15 - val;     /* blue */
         /* green = 15 - ((((7*I2cc[0]) >> 2 ) + I2cc[3]) >> 1); */
         /* I2cc[1] = I2cc[2] = green; */
         if (sd->sensor == SENSOR_PAS106) {
@@ -504,15 +426,16 @@ static void setcolors(struct gspca_dev *gspca_dev)
                 I2cc[3], I2cc[0], green); */
 }
 
-static void getcolors(struct gspca_dev *gspca_dev)
+static s32 getcolors(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
         if (sd->sensor == SENSOR_PAS106) {
 /*              i2c_r(gspca_dev, PAS106_REG9);           * blue */
                 i2c_r(gspca_dev, PAS106_REG9 + 3);      /* red */
-                sd->colors = gspca_dev->usb_buf[0] & 0x0f;
+                return gspca_dev->usb_buf[0] & 0x0f;
         }
+        return 0;
 }
 
 static void setautogain(struct gspca_dev *gspca_dev)
@@ -622,8 +545,7 @@ static void Et_init1(struct gspca_dev *gspca_dev)
         i2c_w(gspca_dev, PAS106_REG7, I2c4, sizeof I2c4, 1);
         /* now set by fifo the whole colors setting */
         reg_w(gspca_dev, ET_G_RED, GainRGBG, 6);
-        getcolors(gspca_dev);
-        setcolors(gspca_dev);
+        setcolors(gspca_dev, getcolors(gspca_dev));
 }
 
 /* this function is called at probe time */
@@ -641,12 +563,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
         } else {
                 cam->cam_mode = vga_mode;
                 cam->nmodes = ARRAY_SIZE(vga_mode);
-                gspca_dev->ctrl_dis = (1 << COLOR_IDX);
         }
-        sd->brightness = BRIGHTNESS_DEF;
-        sd->contrast = CONTRAST_DEF;
-        sd->colors = COLOR_DEF;
-        sd->autogain = AUTOGAIN_DEF;
         sd->ag_cnt = -1;
         return 0;
 }
@@ -780,85 +697,68 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         }
 }
 
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->brightness = val;
-        if (gspca_dev->streaming)
-                setbrightness(gspca_dev);
-        return 0;
-}
-
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->brightness;
-        return 0;
-}
-
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->contrast = val;
-        if (gspca_dev->streaming)
-                setcontrast(gspca_dev);
-        return 0;
-}
-
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->contrast;
-        return 0;
-}
-
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->colors = val;
-        if (gspca_dev->streaming)
-                setcolors(gspca_dev);
-        return 0;
-}
-
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->colors;
-        return 0;
-}
-
-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->autogain = val;
-        if (gspca_dev->streaming)
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
+
+        gspca_dev->usb_err = 0;
+
+        if (!gspca_dev->streaming)
+                return 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                setcontrast(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_SATURATION:
+                setcolors(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_AUTOGAIN:
+                sd->autogain = ctrl->val;
                 setautogain(gspca_dev);
-        return 0;
+                break;
+        }
+        return gspca_dev->usb_err;
 }
 
-static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
 
-        *val = sd->autogain;
+static int sd_init_controls(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *)gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 4);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 1, 127, 1, 63);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, 255, 1, 127);
+        if (sd->sensor == SENSOR_PAS106)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SATURATION, 0, 15, 1, 7);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
         return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
         .pkt_scan = sd_pkt_scan,
@@ -892,6 +792,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c
index 6e26c93b4656..c8f2201cc35a 100644
--- a/drivers/media/video/gspca/finepix.c
+++ b/drivers/media/video/gspca/finepix.c
@@ -299,6 +299,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume  = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/gl860/gl860.c b/drivers/media/video/gspca/gl860/gl860.c
index c549574c1c7e..ced3b71f14e5 100644
--- a/drivers/media/video/gspca/gl860/gl860.c
+++ b/drivers/media/video/gspca/gl860/gl860.c
@@ -521,6 +521,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend    = gspca_suspend,
         .resume     = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 31721eadc597..d4e8343f5b10 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -930,6 +930,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
                         goto out;
                 }
                 gspca_dev->streaming = 1;
+                v4l2_ctrl_handler_setup(gspca_dev->vdev.ctrl_handler);
 
                 /* some bulk transfers are started by the subdriver */
                 if (gspca_dev->cam.bulk && gspca_dev->cam.bulk_nurbs == 0)
@@ -1049,12 +1050,6 @@ static int vidioc_g_register(struct file *file, void *priv,
 {
         struct gspca_dev *gspca_dev = video_drvdata(file);
 
-        if (!gspca_dev->sd_desc->get_chip_ident)
-                return -ENOTTY;
-
-        if (!gspca_dev->sd_desc->get_register)
-                return -ENOTTY;
-
         gspca_dev->usb_err = 0;
         return gspca_dev->sd_desc->get_register(gspca_dev, reg);
 }
@@ -1064,12 +1059,6 @@ static int vidioc_s_register(struct file *file, void *priv,
 {
         struct gspca_dev *gspca_dev = video_drvdata(file);
 
-        if (!gspca_dev->sd_desc->get_chip_ident)
-                return -ENOTTY;
-
-        if (!gspca_dev->sd_desc->set_register)
-                return -ENOTTY;
-
         gspca_dev->usb_err = 0;
         return gspca_dev->sd_desc->set_register(gspca_dev, reg);
 }
@@ -1080,9 +1069,6 @@ static int vidioc_g_chip_ident(struct file *file, void *priv,
 {
         struct gspca_dev *gspca_dev = video_drvdata(file);
 
-        if (!gspca_dev->sd_desc->get_chip_ident)
-                return -ENOTTY;
-
         gspca_dev->usb_err = 0;
         return gspca_dev->sd_desc->get_chip_ident(gspca_dev, chip);
 }
@@ -1136,8 +1122,10 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
         int mode;
 
         mode = gspca_dev->curr_mode;
-        memcpy(&fmt->fmt.pix, &gspca_dev->cam.cam_mode[mode],
-                sizeof fmt->fmt.pix);
+        fmt->fmt.pix = gspca_dev->cam.cam_mode[mode];
+        /* some drivers use priv internally, zero it before giving it to
+           userspace */
+        fmt->fmt.pix.priv = 0;
         return 0;
 }
 
@@ -1168,8 +1156,10 @@ static int try_fmt_vid_cap(struct gspca_dev *gspca_dev,
 /*              else
                         ;                * no chance, return this mode */
         }
-        memcpy(&fmt->fmt.pix, &gspca_dev->cam.cam_mode[mode],
-                sizeof fmt->fmt.pix);
+        fmt->fmt.pix = gspca_dev->cam.cam_mode[mode];
+        /* some drivers use priv internally, zero it before giving it to
+           userspace */
+        fmt->fmt.pix.priv = 0;
         return mode;                    /* used when s_fmt */
 }
 
@@ -1284,9 +1274,6 @@ static void gspca_release(struct v4l2_device *v4l2_device)
         struct gspca_dev *gspca_dev =
                 container_of(v4l2_device, struct gspca_dev, v4l2_dev);
 
-        PDEBUG(D_PROBE, "%s released",
-                video_device_node_name(&gspca_dev->vdev));
-
         v4l2_ctrl_handler_free(gspca_dev->vdev.ctrl_handler);
         v4l2_device_unregister(&gspca_dev->v4l2_dev);
         kfree(gspca_dev->usb_buf);
@@ -1694,8 +1681,6 @@ static int vidioc_g_jpegcomp(struct file *file, void *priv,
 {
         struct gspca_dev *gspca_dev = video_drvdata(file);
 
-        if (!gspca_dev->sd_desc->get_jcomp)
-                return -ENOTTY;
         gspca_dev->usb_err = 0;
         return gspca_dev->sd_desc->get_jcomp(gspca_dev, jpegcomp);
 }
@@ -1705,8 +1690,6 @@ static int vidioc_s_jpegcomp(struct file *file, void *priv,
 {
         struct gspca_dev *gspca_dev = video_drvdata(file);
 
-        if (!gspca_dev->sd_desc->set_jcomp)
-                return -ENOTTY;
         gspca_dev->usb_err = 0;
         return gspca_dev->sd_desc->set_jcomp(gspca_dev, jpegcomp);
 }
@@ -2290,6 +2273,20 @@ int gspca_dev_probe2(struct usb_interface *intf,
         v4l2_disable_ioctl_locking(&gspca_dev->vdev, VIDIOC_DQBUF);
         v4l2_disable_ioctl_locking(&gspca_dev->vdev, VIDIOC_QBUF);
         v4l2_disable_ioctl_locking(&gspca_dev->vdev, VIDIOC_QUERYBUF);
+        if (!gspca_dev->sd_desc->get_chip_ident)
+                v4l2_disable_ioctl(&gspca_dev->vdev, VIDIOC_DBG_G_CHIP_IDENT);
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        if (!gspca_dev->sd_desc->get_chip_ident ||
+            !gspca_dev->sd_desc->get_register)
+                v4l2_disable_ioctl(&gspca_dev->vdev, VIDIOC_DBG_G_REGISTER);
+        if (!gspca_dev->sd_desc->get_chip_ident ||
+            !gspca_dev->sd_desc->set_register)
+                v4l2_disable_ioctl(&gspca_dev->vdev, VIDIOC_DBG_S_REGISTER);
+#endif
+        if (!gspca_dev->sd_desc->get_jcomp)
+                v4l2_disable_ioctl(&gspca_dev->vdev, VIDIOC_G_JPEGCOMP);
+        if (!gspca_dev->sd_desc->set_jcomp)
+                v4l2_disable_ioctl(&gspca_dev->vdev, VIDIOC_S_JPEGCOMP);
 
         /* init video stuff */
         ret = video_register_device(&gspca_dev->vdev,
@@ -2429,7 +2426,6 @@ int gspca_resume(struct usb_interface *intf)
          */
         streaming = gspca_dev->streaming;
         gspca_dev->streaming = 0;
-        v4l2_ctrl_handler_setup(gspca_dev->vdev.ctrl_handler);
         if (streaming)
                 ret = gspca_init_transfer(gspca_dev);
         mutex_unlock(&gspca_dev->usb_lock);
diff --git a/drivers/media/video/gspca/jeilinj.c b/drivers/media/video/gspca/jeilinj.c
index 5ab3f7e12760..26b99310d628 100644
--- a/drivers/media/video/gspca/jeilinj.c
+++ b/drivers/media/video/gspca/jeilinj.c
@@ -54,21 +54,13 @@ enum {
 #define CAMQUALITY_MIN 0        /* highest cam quality */
 #define CAMQUALITY_MAX 97       /* lowest cam quality  */
 
-enum e_ctrl {
-        LIGHTFREQ,
-        AUTOGAIN,
-        RED,
-        GREEN,
-        BLUE,
-        NCTRLS          /* number of controls */
-};
-
 /* Structure to hold all of our device specific stuff */
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
-        struct gspca_ctrl ctrls[NCTRLS];
         int blocks_left;
         const struct v4l2_pix_format *cap_mode;
+        struct v4l2_ctrl *freq;
+        struct v4l2_ctrl *jpegqual;
         /* Driver stuff */
         u8 type;
         u8 quality;                              /* image quality */
@@ -139,23 +131,21 @@ static void jlj_read1(struct gspca_dev *gspca_dev, unsigned char response)
         }
 }
 
-static void setfreq(struct gspca_dev *gspca_dev)
+static void setfreq(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u8 freq_commands[][2] = {
                 {0x71, 0x80},
                 {0x70, 0x07}
         };
 
-        freq_commands[0][1] |= (sd->ctrls[LIGHTFREQ].val >> 1);
+        freq_commands[0][1] |= val >> 1;
 
         jlj_write2(gspca_dev, freq_commands[0]);
         jlj_write2(gspca_dev, freq_commands[1]);
 }
 
-static void setcamquality(struct gspca_dev *gspca_dev)
+static void setcamquality(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u8 quality_commands[][2] = {
                 {0x71, 0x1E},
                 {0x70, 0x06}
@@ -163,7 +153,7 @@ static void setcamquality(struct gspca_dev *gspca_dev)
         u8 camquality;
 
         /* adapt camera quality from jpeg quality */
-        camquality = ((QUALITY_MAX - sd->quality) * CAMQUALITY_MAX)
+        camquality = ((QUALITY_MAX - val) * CAMQUALITY_MAX)
                 / (QUALITY_MAX - QUALITY_MIN);
         quality_commands[0][1] += camquality;
 
@@ -171,130 +161,58 @@ static void setcamquality(struct gspca_dev *gspca_dev)
         jlj_write2(gspca_dev, quality_commands[1]);
 }
 
-static void setautogain(struct gspca_dev *gspca_dev)
+static void setautogain(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u8 autogain_commands[][2] = {
                 {0x94, 0x02},
                 {0xcf, 0x00}
         };
 
-        autogain_commands[1][1] = (sd->ctrls[AUTOGAIN].val << 4);
+        autogain_commands[1][1] = val << 4;
 
         jlj_write2(gspca_dev, autogain_commands[0]);
         jlj_write2(gspca_dev, autogain_commands[1]);
 }
 
-static void setred(struct gspca_dev *gspca_dev)
+static void setred(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u8 setred_commands[][2] = {
                 {0x94, 0x02},
                 {0xe6, 0x00}
         };
 
-        setred_commands[1][1] = sd->ctrls[RED].val;
+        setred_commands[1][1] = val;
 
         jlj_write2(gspca_dev, setred_commands[0]);
         jlj_write2(gspca_dev, setred_commands[1]);
 }
 
-static void setgreen(struct gspca_dev *gspca_dev)
+static void setgreen(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u8 setgreen_commands[][2] = {
                 {0x94, 0x02},
                 {0xe7, 0x00}
         };
 
-        setgreen_commands[1][1] = sd->ctrls[GREEN].val;
+        setgreen_commands[1][1] = val;
 
         jlj_write2(gspca_dev, setgreen_commands[0]);
         jlj_write2(gspca_dev, setgreen_commands[1]);
 }
 
-static void setblue(struct gspca_dev *gspca_dev)
+static void setblue(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u8 setblue_commands[][2] = {
                 {0x94, 0x02},
                 {0xe9, 0x00}
         };
 
-        setblue_commands[1][1] = sd->ctrls[BLUE].val;
+        setblue_commands[1][1] = val;
 
         jlj_write2(gspca_dev, setblue_commands[0]);
         jlj_write2(gspca_dev, setblue_commands[1]);
 }
 
-static const struct ctrl sd_ctrls[NCTRLS] = {
-[LIGHTFREQ] = {
-            {
-                .id      = V4L2_CID_POWER_LINE_FREQUENCY,
-                .type    = V4L2_CTRL_TYPE_MENU,
-                .name    = "Light frequency filter",
-                .minimum = V4L2_CID_POWER_LINE_FREQUENCY_DISABLED, /* 1 */
-                .maximum = V4L2_CID_POWER_LINE_FREQUENCY_60HZ, /* 2 */
-                .step    = 1,
-                .default_value = V4L2_CID_POWER_LINE_FREQUENCY_60HZ,
-            },
-            .set_control = setfreq
-        },
-[AUTOGAIN] = {
-            {
-                .id = V4L2_CID_AUTOGAIN,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Automatic Gain (and Exposure)",
-                .minimum = 0,
-                .maximum = 3,
-                .step = 1,
-#define AUTOGAIN_DEF 0
-                .default_value = AUTOGAIN_DEF,
-           },
-           .set_control = setautogain
-        },
-[RED] = {
-            {
-                .id = V4L2_CID_RED_BALANCE,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "red balance",
-                .minimum = 0,
-                .maximum = 3,
-                .step = 1,
-#define RED_BALANCE_DEF 2
-                .default_value = RED_BALANCE_DEF,
-           },
-           .set_control = setred
-        },
-
-[GREEN] = {
-            {
-                .id = V4L2_CID_GAIN,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "green balance",
-                .minimum = 0,
-                .maximum = 3,
-                .step = 1,
-#define GREEN_BALANCE_DEF 2
-                .default_value = GREEN_BALANCE_DEF,
-           },
-           .set_control = setgreen
-        },
-[BLUE] = {
-            {
-                .id = V4L2_CID_BLUE_BALANCE,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "blue balance",
-                .minimum = 0,
-                .maximum = 3,
-                .step = 1,
-#define BLUE_BALANCE_DEF 2
-                .default_value = BLUE_BALANCE_DEF,
-           },
-           .set_control = setblue
-        },
-};
-
 static int jlj_start(struct gspca_dev *gspca_dev)
 {
         int i;
@@ -344,9 +262,9 @@ static int jlj_start(struct gspca_dev *gspca_dev)
                 if (start_commands[i].ack_wanted)
                         jlj_read1(gspca_dev, response);
         }
-        setcamquality(gspca_dev);
+        setcamquality(gspca_dev, v4l2_ctrl_g_ctrl(sd->jpegqual));
         msleep(2);
-        setfreq(gspca_dev);
+        setfreq(gspca_dev, v4l2_ctrl_g_ctrl(sd->freq));
         if (gspca_dev->usb_err < 0)
                 PDEBUG(D_ERR, "Start streaming command failed");
         return gspca_dev->usb_err;
@@ -403,7 +321,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct sd *dev  = (struct sd *) gspca_dev;
 
         dev->type = id->driver_info;
-        gspca_dev->cam.ctrls = dev->ctrls;
         dev->quality = QUALITY_DEF;
 
         cam->cam_mode = jlj_mode;
@@ -479,25 +396,81 @@ static const struct usb_device_id device_table[] = {
 
 MODULE_DEVICE_TABLE(usb, device_table);
 
-static int sd_querymenu(struct gspca_dev *gspca_dev,
-                        struct v4l2_querymenu *menu)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        switch (menu->id) {
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
+
+        gspca_dev->usb_err = 0;
+
+        if (!gspca_dev->streaming)
+                return 0;
+
+        switch (ctrl->id) {
         case V4L2_CID_POWER_LINE_FREQUENCY:
-                switch (menu->index) {
-                case 0: /* V4L2_CID_POWER_LINE_FREQUENCY_DISABLED */
-                        strcpy((char *) menu->name, "disable");
-                        return 0;
-                case 1: /* V4L2_CID_POWER_LINE_FREQUENCY_50HZ */
-                        strcpy((char *) menu->name, "50 Hz");
-                        return 0;
-                case 2: /* V4L2_CID_POWER_LINE_FREQUENCY_60HZ */
-                        strcpy((char *) menu->name, "60 Hz");
-                        return 0;
-                }
+                setfreq(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_RED_BALANCE:
+                setred(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_GAIN:
+                setgreen(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_BLUE_BALANCE:
+                setblue(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_AUTOGAIN:
+                setautogain(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_JPEG_COMPRESSION_QUALITY:
+                jpeg_set_qual(sd->jpeg_hdr, ctrl->val);
+                setcamquality(gspca_dev, ctrl->val);
                 break;
         }
-        return -EINVAL;
+        return gspca_dev->usb_err;
+}
+
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
+
+static int sd_init_controls(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *)gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+        static const struct v4l2_ctrl_config custom_autogain = {
+                .ops = &sd_ctrl_ops,
+                .id = V4L2_CID_AUTOGAIN,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Automatic Gain (and Exposure)",
+                .max = 3,
+                .step = 1,
+                .def = 0,
+        };
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 6);
+        sd->freq = v4l2_ctrl_new_std_menu(hdl, &sd_ctrl_ops,
+                        V4L2_CID_POWER_LINE_FREQUENCY,
+                        V4L2_CID_POWER_LINE_FREQUENCY_60HZ, 1,
+                        V4L2_CID_POWER_LINE_FREQUENCY_60HZ);
+        v4l2_ctrl_new_custom(hdl, &custom_autogain, NULL);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_RED_BALANCE, 0, 3, 1, 2);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_GAIN, 0, 3, 1, 2);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BLUE_BALANCE, 0, 3, 1, 2);
+        sd->jpegqual = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_JPEG_COMPRESSION_QUALITY,
+                        QUALITY_MIN, QUALITY_MAX, 1, QUALITY_DEF);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+        return 0;
 }
 
 static int sd_set_jcomp(struct gspca_dev *gspca_dev,
@@ -505,16 +478,7 @@ static int sd_set_jcomp(struct gspca_dev *gspca_dev,
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        if (jcomp->quality < QUALITY_MIN)
-                sd->quality = QUALITY_MIN;
-        else if (jcomp->quality > QUALITY_MAX)
-                sd->quality = QUALITY_MAX;
-        else
-                sd->quality = jcomp->quality;
-        if (gspca_dev->streaming) {
-                jpeg_set_qual(sd->jpeg_hdr, sd->quality);
-                setcamquality(gspca_dev);
-        }
+        v4l2_ctrl_s_ctrl(sd->jpegqual, jcomp->quality);
         return 0;
 }
 
@@ -524,7 +488,7 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev,
         struct sd *sd = (struct sd *) gspca_dev;
 
         memset(jcomp, 0, sizeof *jcomp);
-        jcomp->quality = sd->quality;
+        jcomp->quality = v4l2_ctrl_g_ctrl(sd->jpegqual);
         jcomp->jpeg_markers = V4L2_JPEG_MARKER_DHT
                         | V4L2_JPEG_MARKER_DQT;
         return 0;
@@ -546,12 +510,10 @@ static const struct sd_desc sd_desc_sportscam_dv15 = {
         .name   = MODULE_NAME,
         .config = sd_config,
         .init   = sd_init,
+        .init_controls = sd_init_controls,
         .start  = sd_start,
         .stopN  = sd_stopN,
         .pkt_scan = sd_pkt_scan,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
-        .querymenu = sd_querymenu,
         .get_jcomp = sd_get_jcomp,
         .set_jcomp = sd_set_jcomp,
 };
@@ -579,6 +541,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume  = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/jl2005bcd.c b/drivers/media/video/gspca/jl2005bcd.c
index 9c591c7c6f54..cf9d9fca5b84 100644
--- a/drivers/media/video/gspca/jl2005bcd.c
+++ b/drivers/media/video/gspca/jl2005bcd.c
@@ -505,8 +505,6 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        /* .ctrls = none have been detected */
-        /* .nctrls = ARRAY_SIZE(sd_ctrls),  */
         .config = sd_config,
         .init = sd_init,
         .start = sd_start,
@@ -536,6 +534,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/kinect.c b/drivers/media/video/gspca/kinect.c
index e8e8f2fe9166..40ad6687ee5d 100644
--- a/drivers/media/video/gspca/kinect.c
+++ b/drivers/media/video/gspca/kinect.c
@@ -63,12 +63,6 @@ struct sd {
         uint8_t ibuf[0x200];        /* input buffer for control commands */
 };
 
-/* V4L2 controls supported by the driver */
-/* controls prototypes here */
-
-static const struct ctrl sd_ctrls[] = {
-};
-
 #define MODE_640x480   0x0001
 #define MODE_640x488   0x0002
 #define MODE_1280x1024 0x0004
@@ -373,15 +367,12 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, u8 *__data, int len)
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name      = MODULE_NAME,
-        .ctrls     = sd_ctrls,
-        .nctrls    = ARRAY_SIZE(sd_ctrls),
         .config    = sd_config,
         .init      = sd_init,
         .start     = sd_start,
         .stopN     = sd_stopN,
         .pkt_scan  = sd_pkt_scan,
         /*
-        .querymenu = sd_querymenu,
         .get_streamparm = sd_get_streamparm,
         .set_streamparm = sd_set_streamparm,
         */
@@ -410,6 +401,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend    = gspca_suspend,
         .resume     = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/konica.c b/drivers/media/video/gspca/konica.c
index f0c0d74dfe92..bbf91e07e38b 100644
--- a/drivers/media/video/gspca/konica.c
+++ b/drivers/media/video/gspca/konica.c
@@ -50,107 +50,8 @@ struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
         struct urb *last_data_urb;
         u8 snapshot_pressed;
-        u8 brightness;
-        u8 contrast;
-        u8 saturation;
-        u8 whitebal;
-        u8 sharpness;
 };
 
-/* V4L2 controls supported by the driver */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setsaturation(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getsaturation(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setwhitebal(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getwhitebal(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val);
-
-static const struct ctrl sd_ctrls[] = {
-#define SD_BRIGHTNESS 0
-        {
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-                .maximum = 9,
-                .step = 1,
-#define BRIGHTNESS_DEFAULT 4
-                .default_value = BRIGHTNESS_DEFAULT,
-                .flags = 0,
-            },
-            .set = sd_setbrightness,
-            .get = sd_getbrightness,
-        },
-#define SD_CONTRAST 1
-        {
-            {
-                .id = V4L2_CID_CONTRAST,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Contrast",
-                .minimum = 0,
-                .maximum = 9,
-                .step = 4,
-#define CONTRAST_DEFAULT 10
-                .default_value = CONTRAST_DEFAULT,
-                .flags = 0,
-            },
-            .set = sd_setcontrast,
-            .get = sd_getcontrast,
-        },
-#define SD_SATURATION 2
-        {
-            {
-                .id     = V4L2_CID_SATURATION,
-                .type   = V4L2_CTRL_TYPE_INTEGER,
-                .name   = "Saturation",
-                .minimum = 0,
-                .maximum = 9,
-                .step   = 1,
-#define SATURATION_DEFAULT 4
-                .default_value = SATURATION_DEFAULT,
-                .flags = 0,
-            },
-            .set = sd_setsaturation,
-            .get = sd_getsaturation,
-        },
-#define SD_WHITEBAL 3
-        {
-            {
-                .id = V4L2_CID_WHITE_BALANCE_TEMPERATURE,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "White Balance",
-                .minimum = 0,
-                .maximum = 33,
-                .step = 1,
-#define WHITEBAL_DEFAULT 25
-                .default_value = WHITEBAL_DEFAULT,
-                .flags = 0,
-            },
-            .set = sd_setwhitebal,
-            .get = sd_getwhitebal,
-        },
-#define SD_SHARPNESS 4
-        {
-            {
-                .id = V4L2_CID_SHARPNESS,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Sharpness",
-                .minimum = 0,
-                .maximum = 9,
-                .step = 1,
-#define SHARPNESS_DEFAULT 4
-                .default_value = SHARPNESS_DEFAULT,
-                .flags = 0,
-            },
-            .set = sd_setsharpness,
-            .get = sd_getsharpness,
-        },
-};
 
 /* .priv is what goes to register 8 for this mode, known working values:
    0x00 -> 176x144, cropped
@@ -202,7 +103,8 @@ static void reg_w(struct gspca_dev *gspca_dev, u16 value, u16 index)
                         0,
                         1000);
         if (ret < 0) {
-                pr_err("reg_w err %d\n", ret);
+                pr_err("reg_w err writing %02x to %02x: %d\n",
+                       value, index, ret);
                 gspca_dev->usb_err = ret;
         }
 }
@@ -223,7 +125,7 @@ static void reg_r(struct gspca_dev *gspca_dev, u16 value, u16 index)
                         2,
                         1000);
         if (ret < 0) {
-                pr_err("reg_w err %d\n", ret);
+                pr_err("reg_r err %d\n", ret);
                 gspca_dev->usb_err = ret;
         }
 }
@@ -242,34 +144,33 @@ static void konica_stream_off(struct gspca_dev *gspca_dev)
 static int sd_config(struct gspca_dev *gspca_dev,
                         const struct usb_device_id *id)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
         gspca_dev->cam.cam_mode = vga_mode;
         gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode);
         gspca_dev->cam.no_urb_create = 1;
 
-        sd->brightness  = BRIGHTNESS_DEFAULT;
-        sd->contrast    = CONTRAST_DEFAULT;
-        sd->saturation  = SATURATION_DEFAULT;
-        sd->whitebal    = WHITEBAL_DEFAULT;
-        sd->sharpness   = SHARPNESS_DEFAULT;
-
         return 0;
 }
 
 /* this function is called at probe and resume time */
 static int sd_init(struct gspca_dev *gspca_dev)
 {
-        /* HDG not sure if these 2 reads are needed */
-        reg_r(gspca_dev, 0, 0x10);
-        PDEBUG(D_PROBE, "Reg 0x10 reads: %02x %02x",
-               gspca_dev->usb_buf[0], gspca_dev->usb_buf[1]);
-        reg_r(gspca_dev, 0, 0x10);
-        PDEBUG(D_PROBE, "Reg 0x10 reads: %02x %02x",
-               gspca_dev->usb_buf[0], gspca_dev->usb_buf[1]);
+        int i;
+
+        /*
+         * The konica needs a freaking large time to "boot" (approx 6.5 sec.),
+         * and does not want to be bothered while doing so :|
+         * Register 0x10 counts from 1 - 3, with 3 being "ready"
+         */
+        msleep(6000);
+        for (i = 0; i < 20; i++) {
+                reg_r(gspca_dev, 0, 0x10);
+                if (gspca_dev->usb_buf[0] == 3)
+                        break;
+                msleep(100);
+        }
         reg_w(gspca_dev, 0, 0x0d);
 
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 static int sd_start(struct gspca_dev *gspca_dev)
@@ -289,12 +190,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
         packet_size = le16_to_cpu(alt->endpoint[0].desc.wMaxPacketSize);
 
-        reg_w(gspca_dev, sd->brightness, BRIGHTNESS_REG);
-        reg_w(gspca_dev, sd->whitebal, WHITEBAL_REG);
-        reg_w(gspca_dev, sd->contrast, CONTRAST_REG);
-        reg_w(gspca_dev, sd->saturation, SATURATION_REG);
-        reg_w(gspca_dev, sd->sharpness, SHARPNESS_REG);
-
         n = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].priv;
         reg_w(gspca_dev, n, 0x08);
 
@@ -479,125 +374,82 @@ resubmit:
                 pr_err("usb_submit_urb(status_urb) ret %d\n", st);
 }
 
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->brightness = val;
-        if (gspca_dev->streaming) {
-                konica_stream_off(gspca_dev);
-                reg_w(gspca_dev, sd->brightness, BRIGHTNESS_REG);
-                konica_stream_on(gspca_dev);
-        }
-
-        return 0;
-}
-
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->brightness;
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
 
-        return 0;
-}
+        gspca_dev->usb_err = 0;
 
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        if (!gspca_dev->streaming)
+                return 0;
 
-        sd->contrast = val;
-        if (gspca_dev->streaming) {
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
                 konica_stream_off(gspca_dev);
-                reg_w(gspca_dev, sd->contrast, CONTRAST_REG);
+                reg_w(gspca_dev, ctrl->val, BRIGHTNESS_REG);
                 konica_stream_on(gspca_dev);
-        }
-
-        return 0;
-}
-
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->contrast;
-
-        return 0;
-}
-
-static int sd_setsaturation(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->saturation = val;
-        if (gspca_dev->streaming) {
+                break;
+        case V4L2_CID_CONTRAST:
                 konica_stream_off(gspca_dev);
-                reg_w(gspca_dev, sd->saturation, SATURATION_REG);
+                reg_w(gspca_dev, ctrl->val, CONTRAST_REG);
                 konica_stream_on(gspca_dev);
-        }
-        return 0;
-}
-
-static int sd_getsaturation(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->saturation;
-
-        return 0;
-}
-
-static int sd_setwhitebal(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->whitebal = val;
-        if (gspca_dev->streaming) {
+                break;
+        case V4L2_CID_SATURATION:
                 konica_stream_off(gspca_dev);
-                reg_w(gspca_dev, sd->whitebal, WHITEBAL_REG);
+                reg_w(gspca_dev, ctrl->val, SATURATION_REG);
                 konica_stream_on(gspca_dev);
-        }
-        return 0;
-}
-
-static int sd_getwhitebal(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->whitebal;
-
-        return 0;
-}
-
-static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->sharpness = val;
-        if (gspca_dev->streaming) {
+                break;
+        case V4L2_CID_WHITE_BALANCE_TEMPERATURE:
                 konica_stream_off(gspca_dev);
-                reg_w(gspca_dev, sd->sharpness, SHARPNESS_REG);
+                reg_w(gspca_dev, ctrl->val, WHITEBAL_REG);
                 konica_stream_on(gspca_dev);
+                break;
+        case V4L2_CID_SHARPNESS:
+                konica_stream_off(gspca_dev);
+                reg_w(gspca_dev, ctrl->val, SHARPNESS_REG);
+                konica_stream_on(gspca_dev);
+                break;
         }
-        return 0;
+        return gspca_dev->usb_err;
 }
 
-static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->sharpness;
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
 
+static int sd_init_controls(struct gspca_dev *gspca_dev)
+{
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 5);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 9, 1, 4);
+        /* Needs to be verified */
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, 9, 1, 4);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SATURATION, 0, 9, 1, 4);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_WHITE_BALANCE_TEMPERATURE,
+                        0, 33, 1, 25);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SHARPNESS, 0, 9, 1, 4);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
         return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
 #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
@@ -628,6 +480,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c
index 0c4493675438..ed22638978ce 100644
--- a/drivers/media/video/gspca/m5602/m5602_core.c
+++ b/drivers/media/video/gspca/m5602/m5602_core.c
@@ -400,6 +400,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
         .disconnect = m5602_disconnect
 };
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c
index ec7b21ee79fb..ff2c5abf115b 100644
--- a/drivers/media/video/gspca/mars.c
+++ b/drivers/media/video/gspca/mars.c
@@ -30,6 +30,8 @@ MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/Mars USB Camera Driver");
 MODULE_LICENSE("GPL");
 
+#define QUALITY 50
+
 /* specific webcam descriptor */
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
@@ -42,13 +44,6 @@ struct sd {
                 struct v4l2_ctrl *illum_top;
                 struct v4l2_ctrl *illum_bottom;
         };
-        struct v4l2_ctrl *jpegqual;
-
-        u8 quality;
-#define QUALITY_MIN 40
-#define QUALITY_MAX 70
-#define QUALITY_DEF 50
-
         u8 jpeg_hdr[JPEG_HDR_SZ];
 };
 
@@ -194,9 +189,6 @@ static int mars_s_ctrl(struct v4l2_ctrl *ctrl)
         case V4L2_CID_SHARPNESS:
                 setsharpness(gspca_dev, ctrl->val);
                 break;
-        case V4L2_CID_JPEG_COMPRESSION_QUALITY:
-                jpeg_set_qual(sd->jpeg_hdr, ctrl->val);
-                break;
         default:
                 return -EINVAL;
         }
@@ -214,7 +206,7 @@ static int sd_init_controls(struct gspca_dev *gspca_dev)
         struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
 
         gspca_dev->vdev.ctrl_handler = hdl;
-        v4l2_ctrl_handler_init(hdl, 7);
+        v4l2_ctrl_handler_init(hdl, 6);
         sd->brightness = v4l2_ctrl_new_std(hdl, &mars_ctrl_ops,
                         V4L2_CID_BRIGHTNESS, 0, 30, 1, 15);
         sd->saturation = v4l2_ctrl_new_std(hdl, &mars_ctrl_ops,
@@ -229,9 +221,6 @@ static int sd_init_controls(struct gspca_dev *gspca_dev)
         sd->illum_bottom = v4l2_ctrl_new_std(hdl, &mars_ctrl_ops,
                         V4L2_CID_ILLUMINATORS_2, 0, 1, 1, 0);
         sd->illum_bottom->flags |= V4L2_CTRL_FLAG_UPDATE;
-        sd->jpegqual = v4l2_ctrl_new_std(hdl, &mars_ctrl_ops,
-                        V4L2_CID_JPEG_COMPRESSION_QUALITY,
-                        QUALITY_MIN, QUALITY_MAX, 1, QUALITY_DEF);
         if (hdl->error) {
                 pr_err("Could not initialize controls\n");
                 return hdl->error;
@@ -244,13 +233,11 @@ static int sd_init_controls(struct gspca_dev *gspca_dev)
 static int sd_config(struct gspca_dev *gspca_dev,
                         const struct usb_device_id *id)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
 
         cam = &gspca_dev->cam;
         cam->cam_mode = vga_mode;
         cam->nmodes = ARRAY_SIZE(vga_mode);
-        sd->quality = QUALITY_DEF;
         return 0;
 }
 
@@ -269,7 +256,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
         /* create the JPEG header */
         jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width,
                         0x21);          /* JPEG 422 */
-        jpeg_set_qual(sd->jpeg_hdr, v4l2_ctrl_g_ctrl(sd->jpegqual));
+        jpeg_set_qual(sd->jpeg_hdr, QUALITY);
 
         data = gspca_dev->usb_buf;
 
@@ -411,31 +398,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
 }
 
-static int sd_set_jcomp(struct gspca_dev *gspca_dev,
-                        struct v4l2_jpegcompression *jcomp)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-        int ret;
-
-        ret = v4l2_ctrl_s_ctrl(sd->jpegqual, jcomp->quality);
-        if (ret)
-                return ret;
-        jcomp->quality = v4l2_ctrl_g_ctrl(sd->jpegqual);
-        return 0;
-}
-
-static int sd_get_jcomp(struct gspca_dev *gspca_dev,
-                        struct v4l2_jpegcompression *jcomp)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        memset(jcomp, 0, sizeof *jcomp);
-        jcomp->quality = v4l2_ctrl_g_ctrl(sd->jpegqual);
-        jcomp->jpeg_markers = V4L2_JPEG_MARKER_DHT
-                        | V4L2_JPEG_MARKER_DQT;
-        return 0;
-}
-
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
@@ -445,8 +407,6 @@ static const struct sd_desc sd_desc = {
         .start = sd_start,
         .stopN = sd_stopN,
         .pkt_scan = sd_pkt_scan,
-        .get_jcomp = sd_get_jcomp,
-        .set_jcomp = sd_set_jcomp,
 };
 
 /* -- module initialisation -- */
diff --git a/drivers/media/video/gspca/mr97310a.c b/drivers/media/video/gspca/mr97310a.c
index d73e5bd3dbf7..8f4714df5990 100644
--- a/drivers/media/video/gspca/mr97310a.c
+++ b/drivers/media/video/gspca/mr97310a.c
@@ -67,6 +67,7 @@
 #define MR97310A_CS_GAIN_MAX            0x7ff
 #define MR97310A_CS_GAIN_DEFAULT        0x110
 
+#define MR97310A_CID_CLOCKDIV (V4L2_CTRL_CLASS_USER + 0x1000)
 #define MR97310A_MIN_CLOCKDIV_MIN       3
 #define MR97310A_MIN_CLOCKDIV_MAX       8
 #define MR97310A_MIN_CLOCKDIV_DEFAULT   3
@@ -84,17 +85,15 @@ MODULE_PARM_DESC(force_sensor_type, "Force sensor type (-1 (auto), 0 or 1)");
 /* specific webcam descriptor */
 struct sd {
         struct gspca_dev gspca_dev;  /* !! must be the first item */
+        struct { /* exposure/min_clockdiv control cluster */
+                struct v4l2_ctrl *exposure;
+                struct v4l2_ctrl *min_clockdiv;
+        };
         u8 sof_read;
         u8 cam_type;    /* 0 is CIF and 1 is VGA */
         u8 sensor_type; /* We use 0 and 1 here, too. */
         u8 do_lcd_stop;
         u8 adj_colors;
-
-        int brightness;
-        u16 exposure;
-        u32 gain;
-        u8 contrast;
-        u8 min_clockdiv;
 };
 
 struct sensor_w_data {
@@ -105,132 +104,6 @@ struct sensor_w_data {
 };
 
 static void sd_stopN(struct gspca_dev *gspca_dev);
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setmin_clockdiv(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getmin_clockdiv(struct gspca_dev *gspca_dev, __s32 *val);
-static void setbrightness(struct gspca_dev *gspca_dev);
-static void setexposure(struct gspca_dev *gspca_dev);
-static void setgain(struct gspca_dev *gspca_dev);
-static void setcontrast(struct gspca_dev *gspca_dev);
-
-/* V4L2 controls supported by the driver */
-static const struct ctrl sd_ctrls[] = {
-/* Separate brightness control description for Argus QuickClix as it has
- * different limits from the other mr97310a cameras, and separate gain
- * control for Sakar CyberPix camera. */
-        {
-#define NORM_BRIGHTNESS_IDX 0
-                {
-                        .id = V4L2_CID_BRIGHTNESS,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "Brightness",
-                        .minimum = -254,
-                        .maximum = 255,
-                        .step = 1,
-                        .default_value = MR97310A_BRIGHTNESS_DEFAULT,
-                        .flags = 0,
-                },
-                .set = sd_setbrightness,
-                .get = sd_getbrightness,
-        },
-        {
-#define ARGUS_QC_BRIGHTNESS_IDX 1
-                {
-                        .id = V4L2_CID_BRIGHTNESS,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "Brightness",
-                        .minimum = 0,
-                        .maximum = 15,
-                        .step = 1,
-                        .default_value = MR97310A_BRIGHTNESS_DEFAULT,
-                        .flags = 0,
-                },
-                .set = sd_setbrightness,
-                .get = sd_getbrightness,
-        },
-        {
-#define EXPOSURE_IDX 2
-                {
-                        .id = V4L2_CID_EXPOSURE,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "Exposure",
-                        .minimum = MR97310A_EXPOSURE_MIN,
-                        .maximum = MR97310A_EXPOSURE_MAX,
-                        .step = 1,
-                        .default_value = MR97310A_EXPOSURE_DEFAULT,
-                        .flags = 0,
-                },
-                .set = sd_setexposure,
-                .get = sd_getexposure,
-        },
-        {
-#define GAIN_IDX 3
-                {
-                        .id = V4L2_CID_GAIN,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "Gain",
-                        .minimum = MR97310A_GAIN_MIN,
-                        .maximum = MR97310A_GAIN_MAX,
-                        .step = 1,
-                        .default_value = MR97310A_GAIN_DEFAULT,
-                        .flags = 0,
-                },
-                .set = sd_setgain,
-                .get = sd_getgain,
-        },
-        {
-#define SAKAR_CS_GAIN_IDX 4
-                {
-                        .id = V4L2_CID_GAIN,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "Gain",
-                        .minimum = MR97310A_CS_GAIN_MIN,
-                        .maximum = MR97310A_CS_GAIN_MAX,
-                        .step = 1,
-                        .default_value = MR97310A_CS_GAIN_DEFAULT,
-                        .flags = 0,
-                },
-                .set = sd_setgain,
-                .get = sd_getgain,
-        },
-        {
-#define CONTRAST_IDX 5
-                {
-                        .id = V4L2_CID_CONTRAST,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "Contrast",
-                        .minimum = MR97310A_CONTRAST_MIN,
-                        .maximum = MR97310A_CONTRAST_MAX,
-                        .step = 1,
-                        .default_value = MR97310A_CONTRAST_DEFAULT,
-                        .flags = 0,
-                },
-                .set = sd_setcontrast,
-                .get = sd_getcontrast,
-        },
-        {
-#define MIN_CLOCKDIV_IDX 6
-                {
-                        .id = V4L2_CID_PRIVATE_BASE,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "Minimum Clock Divider",
-                        .minimum = MR97310A_MIN_CLOCKDIV_MIN,
-                        .maximum = MR97310A_MIN_CLOCKDIV_MAX,
-                        .step = 1,
-                        .default_value = MR97310A_MIN_CLOCKDIV_DEFAULT,
-                        .flags = 0,
-                },
-                .set = sd_setmin_clockdiv,
-                .get = sd_getmin_clockdiv,
-        },
-};
 
 static const struct v4l2_pix_format vga_mode[] = {
         {160, 120, V4L2_PIX_FMT_MR97310A, V4L2_FIELD_NONE,
@@ -481,7 +354,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
-        int gain_default = MR97310A_GAIN_DEFAULT;
         int err_code;
 
         cam = &gspca_dev->cam;
@@ -615,52 +487,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
                        sd->sensor_type);
         }
 
-        /* Setup controls depending on camera type */
-        if (sd->cam_type == CAM_TYPE_CIF) {
-                /* No brightness for sensor_type 0 */
-                if (sd->sensor_type == 0)
-                        gspca_dev->ctrl_dis = (1 << NORM_BRIGHTNESS_IDX) |
-                                              (1 << ARGUS_QC_BRIGHTNESS_IDX) |
-                                              (1 << CONTRAST_IDX) |
-                                              (1 << SAKAR_CS_GAIN_IDX);
-                else
-                        gspca_dev->ctrl_dis = (1 << ARGUS_QC_BRIGHTNESS_IDX) |
-                                              (1 << CONTRAST_IDX) |
-                                              (1 << SAKAR_CS_GAIN_IDX) |
-                                              (1 << MIN_CLOCKDIV_IDX);
-        } else {
-                /* All controls need to be disabled if VGA sensor_type is 0 */
-                if (sd->sensor_type == 0)
-                        gspca_dev->ctrl_dis = (1 << NORM_BRIGHTNESS_IDX) |
-                                              (1 << ARGUS_QC_BRIGHTNESS_IDX) |
-                                              (1 << EXPOSURE_IDX) |
-                                              (1 << GAIN_IDX) |
-                                              (1 << CONTRAST_IDX) |
-                                              (1 << SAKAR_CS_GAIN_IDX) |
-                                              (1 << MIN_CLOCKDIV_IDX);
-                else if (sd->sensor_type == 2) {
-                        gspca_dev->ctrl_dis = (1 << NORM_BRIGHTNESS_IDX) |
-                                              (1 << ARGUS_QC_BRIGHTNESS_IDX) |
-                                              (1 << GAIN_IDX) |
-                                              (1 << MIN_CLOCKDIV_IDX);
-                        gain_default = MR97310A_CS_GAIN_DEFAULT;
-                } else if (sd->do_lcd_stop)
-                        /* Argus QuickClix has different brightness limits */
-                        gspca_dev->ctrl_dis = (1 << NORM_BRIGHTNESS_IDX) |
-                                              (1 << CONTRAST_IDX) |
-                                              (1 << SAKAR_CS_GAIN_IDX);
-                else
-                        gspca_dev->ctrl_dis = (1 << ARGUS_QC_BRIGHTNESS_IDX) |
-                                              (1 << CONTRAST_IDX) |
-                                              (1 << SAKAR_CS_GAIN_IDX);
-        }
-
-        sd->brightness = MR97310A_BRIGHTNESS_DEFAULT;
-        sd->exposure = MR97310A_EXPOSURE_DEFAULT;
-        sd->gain = gain_default;
-        sd->contrast = MR97310A_CONTRAST_DEFAULT;
-        sd->min_clockdiv = MR97310A_MIN_CLOCKDIV_DEFAULT;
-
         return 0;
 }
 
@@ -952,11 +778,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
         if (err_code < 0)
                 return err_code;
 
-        setbrightness(gspca_dev);
-        setcontrast(gspca_dev);
-        setexposure(gspca_dev);
-        setgain(gspca_dev);
-
         return isoc_enable(gspca_dev);
 }
 
@@ -971,37 +792,25 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
                 lcd_stop(gspca_dev);
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        u8 val;
         u8 sign_reg = 7;  /* This reg and the next one used on CIF cams. */
         u8 value_reg = 8; /* VGA cams seem to use regs 0x0b and 0x0c */
         static const u8 quick_clix_table[] =
         /*        0  1  2   3  4  5  6  7  8  9  10  11  12  13  14  15 */
                 { 0, 4, 8, 12, 1, 2, 3, 5, 6, 9,  7, 10, 13, 11, 14, 15};
-        /*
-         * This control is disabled for CIF type 1 and VGA type 0 cameras.
-         * It does not quite act linearly for the Argus QuickClix camera,
-         * but it does control brightness. The values are 0 - 15 only, and
-         * the table above makes them act consecutively.
-         */
-        if ((gspca_dev->ctrl_dis & (1 << NORM_BRIGHTNESS_IDX)) &&
-            (gspca_dev->ctrl_dis & (1 << ARGUS_QC_BRIGHTNESS_IDX)))
-                return;
-
         if (sd->cam_type == CAM_TYPE_VGA) {
                 sign_reg += 4;
                 value_reg += 4;
         }
 
         /* Note register 7 is also seen as 0x8x or 0xCx in some dumps */
-        if (sd->brightness > 0) {
+        if (val > 0) {
                 sensor_write1(gspca_dev, sign_reg, 0x00);
-                val = sd->brightness;
         } else {
                 sensor_write1(gspca_dev, sign_reg, 0x01);
-                val = (257 - sd->brightness);
+                val = 257 - val;
         }
         /* Use lookup table for funky Argus QuickClix brightness */
         if (sd->do_lcd_stop)
@@ -1010,23 +819,20 @@ static void setbrightness(struct gspca_dev *gspca_dev)
         sensor_write1(gspca_dev, value_reg, val);
 }
 
-static void setexposure(struct gspca_dev *gspca_dev)
+static void setexposure(struct gspca_dev *gspca_dev, s32 expo, s32 min_clockdiv)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         int exposure = MR97310A_EXPOSURE_DEFAULT;
         u8 buf[2];
 
-        if (gspca_dev->ctrl_dis & (1 << EXPOSURE_IDX))
-                return;
-
         if (sd->cam_type == CAM_TYPE_CIF && sd->sensor_type == 1) {
                 /* This cam does not like exposure settings < 300,
                    so scale 0 - 4095 to 300 - 4095 */
-                exposure = (sd->exposure * 9267) / 10000 + 300;
+                exposure = (expo * 9267) / 10000 + 300;
                 sensor_write1(gspca_dev, 3, exposure >> 4);
                 sensor_write1(gspca_dev, 4, exposure & 0x0f);
         } else if (sd->sensor_type == 2) {
-                exposure = sd->exposure;
+                exposure = expo;
                 exposure >>= 3;
                 sensor_write1(gspca_dev, 3, exposure >> 8);
                 sensor_write1(gspca_dev, 4, exposure & 0xff);
@@ -1038,11 +844,11 @@ static void setexposure(struct gspca_dev *gspca_dev)
 
                    Note our 0 - 4095 exposure is mapped to 0 - 511
                    milliseconds exposure time */
-                u8 clockdiv = (60 * sd->exposure + 7999) / 8000;
+                u8 clockdiv = (60 * expo + 7999) / 8000;
 
                 /* Limit framerate to not exceed usb bandwidth */
-                if (clockdiv < sd->min_clockdiv && gspca_dev->width >= 320)
-                        clockdiv = sd->min_clockdiv;
+                if (clockdiv < min_clockdiv && gspca_dev->width >= 320)
+                        clockdiv = min_clockdiv;
                 else if (clockdiv < 2)
                         clockdiv = 2;
 
@@ -1051,7 +857,7 @@ static void setexposure(struct gspca_dev *gspca_dev)
 
                 /* Frame exposure time in ms = 1000 * clockdiv / 60 ->
                 exposure = (sd->exposure / 8) * 511 / (1000 * clockdiv / 60) */
-                exposure = (60 * 511 * sd->exposure) / (8000 * clockdiv);
+                exposure = (60 * 511 * expo) / (8000 * clockdiv);
                 if (exposure > 511)
                         exposure = 511;
 
@@ -1065,125 +871,148 @@ static void setexposure(struct gspca_dev *gspca_dev)
         }
 }
 
-static void setgain(struct gspca_dev *gspca_dev)
+static void setgain(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u8 gainreg;
 
-        if ((gspca_dev->ctrl_dis & (1 << GAIN_IDX)) &&
-            (gspca_dev->ctrl_dis & (1 << SAKAR_CS_GAIN_IDX)))
-                return;
-
         if (sd->cam_type == CAM_TYPE_CIF && sd->sensor_type == 1)
-                sensor_write1(gspca_dev, 0x0e, sd->gain);
+                sensor_write1(gspca_dev, 0x0e, val);
         else if (sd->cam_type == CAM_TYPE_VGA && sd->sensor_type == 2)
                 for (gainreg = 0x0a; gainreg < 0x11; gainreg += 2) {
-                        sensor_write1(gspca_dev, gainreg, sd->gain >> 8);
-                        sensor_write1(gspca_dev, gainreg + 1, sd->gain & 0xff);
+                        sensor_write1(gspca_dev, gainreg, val >> 8);
+                        sensor_write1(gspca_dev, gainreg + 1, val & 0xff);
                 }
         else
-                sensor_write1(gspca_dev, 0x10, sd->gain);
-}
-
-static void setcontrast(struct gspca_dev *gspca_dev)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        if (gspca_dev->ctrl_dis & (1 << CONTRAST_IDX))
-                return;
-
-        sensor_write1(gspca_dev, 0x1c, sd->contrast);
-}
-
-
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->brightness = val;
-        if (gspca_dev->streaming)
-                setbrightness(gspca_dev);
-        return 0;
-}
-
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->brightness;
-        return 0;
-}
-
-static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->exposure = val;
-        if (gspca_dev->streaming)
-                setexposure(gspca_dev);
-        return 0;
+                sensor_write1(gspca_dev, 0x10, val);
 }
 
-static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val)
+static void setcontrast(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->exposure;
-        return 0;
+        sensor_write1(gspca_dev, 0x1c, val);
 }
 
-static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
 
-        sd->gain = val;
-        if (gspca_dev->streaming)
-                setgain(gspca_dev);
-        return 0;
-}
+        gspca_dev->usb_err = 0;
 
-static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->gain;
-        return 0;
-}
+        if (!gspca_dev->streaming)
+                return 0;
 
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->contrast = val;
-        if (gspca_dev->streaming)
-                setcontrast(gspca_dev);
-        return 0;
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                setcontrast(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_EXPOSURE:
+                setexposure(gspca_dev, sd->exposure->val,
+                            sd->min_clockdiv ? sd->min_clockdiv->val : 0);
+                break;
+        case V4L2_CID_GAIN:
+                setgain(gspca_dev, ctrl->val);
+                break;
+        }
+        return gspca_dev->usb_err;
 }
 
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
 
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->contrast;
-        return 0;
-}
-
-static int sd_setmin_clockdiv(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_init_controls(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct sd *sd = (struct sd *)gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+        static const struct v4l2_ctrl_config clockdiv = {
+                .ops = &sd_ctrl_ops,
+                .id = MR97310A_CID_CLOCKDIV,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Minimum Clock Divider",
+                .min = MR97310A_MIN_CLOCKDIV_MIN,
+                .max = MR97310A_MIN_CLOCKDIV_MAX,
+                .step = 1,
+                .def = MR97310A_MIN_CLOCKDIV_DEFAULT,
+        };
+        bool has_brightness = false;
+        bool has_argus_brightness = false;
+        bool has_contrast = false;
+        bool has_gain = false;
+        bool has_cs_gain = false;
+        bool has_exposure = false;
+        bool has_clockdiv = false;
 
-        sd->min_clockdiv = val;
-        if (gspca_dev->streaming)
-                setexposure(gspca_dev);
-        return 0;
-}
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 4);
 
-static int sd_getmin_clockdiv(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        /* Setup controls depending on camera type */
+        if (sd->cam_type == CAM_TYPE_CIF) {
+                /* No brightness for sensor_type 0 */
+                if (sd->sensor_type == 0)
+                        has_exposure = has_gain = has_clockdiv = true;
+                else
+                        has_exposure = has_gain = has_brightness = true;
+        } else {
+                /* All controls need to be disabled if VGA sensor_type is 0 */
+                if (sd->sensor_type == 0)
+                        ; /* no controls! */
+                else if (sd->sensor_type == 2)
+                        has_exposure = has_cs_gain = has_contrast = true;
+                else if (sd->do_lcd_stop)
+                        has_exposure = has_gain = has_argus_brightness =
+                                has_clockdiv = true;
+                else
+                        has_exposure = has_gain = has_brightness =
+                                has_clockdiv = true;
+        }
 
-        *val = sd->min_clockdiv;
+        /* Separate brightness control description for Argus QuickClix as it has
+         * different limits from the other mr97310a cameras, and separate gain
+         * control for Sakar CyberPix camera. */
+        /*
+         * This control is disabled for CIF type 1 and VGA type 0 cameras.
+         * It does not quite act linearly for the Argus QuickClix camera,
+         * but it does control brightness. The values are 0 - 15 only, and
+         * the table above makes them act consecutively.
+         */
+        if (has_brightness)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, -254, 255, 1,
+                        MR97310A_BRIGHTNESS_DEFAULT);
+        else if (has_argus_brightness)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 15, 1,
+                        MR97310A_BRIGHTNESS_DEFAULT);
+        if (has_contrast)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, MR97310A_CONTRAST_MIN,
+                        MR97310A_CONTRAST_MAX, 1, MR97310A_CONTRAST_DEFAULT);
+        if (has_gain)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_GAIN, MR97310A_GAIN_MIN, MR97310A_GAIN_MAX,
+                        1, MR97310A_GAIN_DEFAULT);
+        else if (has_cs_gain)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops, V4L2_CID_GAIN,
+                        MR97310A_CS_GAIN_MIN, MR97310A_CS_GAIN_MAX,
+                        1, MR97310A_CS_GAIN_DEFAULT);
+        if (has_exposure)
+                sd->exposure = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_EXPOSURE, MR97310A_EXPOSURE_MIN,
+                        MR97310A_EXPOSURE_MAX, 1, MR97310A_EXPOSURE_DEFAULT);
+        if (has_clockdiv)
+                sd->min_clockdiv = v4l2_ctrl_new_custom(hdl, &clockdiv, NULL);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+        if (has_exposure && has_clockdiv)
+                v4l2_ctrl_cluster(2, &sd->exposure);
         return 0;
 }
 
@@ -1221,10 +1050,9 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
         .pkt_scan = sd_pkt_scan,
@@ -1256,6 +1084,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/nw80x.c b/drivers/media/video/gspca/nw80x.c
index 42e021931e60..44c9964b1b3e 100644
--- a/drivers/media/video/gspca/nw80x.c
+++ b/drivers/media/video/gspca/nw80x.c
@@ -32,22 +32,10 @@ MODULE_LICENSE("GPL");
 
 static int webcam;
 
-/* controls */
-enum e_ctrl {
-        GAIN,
-        EXPOSURE,
-        AUTOGAIN,
-        NCTRLS          /* number of controls */
-};
-
-#define AUTOGAIN_DEF 1
-
 /* specific webcam descriptor */
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
 
-        struct gspca_ctrl ctrls[NCTRLS];
-
         u32 ae_res;
         s8 ag_cnt;
 #define AG_CNT_START 13
@@ -1667,17 +1655,13 @@ static int swap_bits(int v)
         return r;
 }
 
-static void setgain(struct gspca_dev *gspca_dev)
+static void setgain(struct gspca_dev *gspca_dev, u8 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        u8 val, v[2];
+        u8 v[2];
 
-        val = sd->ctrls[GAIN].val;
         switch (sd->webcam) {
         case P35u:
-                /* Note the control goes from 0-255 not 0-127, but anything
-                   above 127 just means amplifying noise */
-                val >>= 1;                      /* 0 - 255 -> 0 - 127 */
                 reg_w(gspca_dev, 0x1026, &val, 1);
                 break;
         case Kr651us:
@@ -1690,13 +1674,11 @@ static void setgain(struct gspca_dev *gspca_dev)
         }
 }
 
-static void setexposure(struct gspca_dev *gspca_dev)
+static void setexposure(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        s16 val;
         u8 v[2];
 
-        val = sd->ctrls[EXPOSURE].val;
         switch (sd->webcam) {
         case P35u:
                 v[0] = ((9 - val) << 3) | 0x01;
@@ -1713,14 +1695,12 @@ static void setexposure(struct gspca_dev *gspca_dev)
         }
 }
 
-static void setautogain(struct gspca_dev *gspca_dev)
+static void setautogain(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         int w, h;
 
-        if (gspca_dev->ctrl_dis & (1 << AUTOGAIN))
-                return;
-        if (!sd->ctrls[AUTOGAIN].val) {
+        if (!val) {
                 sd->ag_cnt = -1;
                 return;
         }
@@ -1763,7 +1743,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         if ((unsigned) webcam >= NWEBCAMS)
                 webcam = 0;
         sd->webcam = webcam;
-        gspca_dev->cam.ctrls = sd->ctrls;
         gspca_dev->cam.needs_full_bandwidth = 1;
         sd->ag_cnt = -1;
 
@@ -1834,33 +1813,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
                         break;
                 }
         }
-        switch (sd->webcam) {
-        case P35u:
-/*              sd->ctrls[EXPOSURE].max = 9;
- *              sd->ctrls[EXPOSURE].def = 9; */
-                /* coarse expo auto gain function gain minimum, to avoid
-                 * a large settings jump the first auto adjustment */
-                sd->ctrls[GAIN].def = 255 / 5 * 2;
-                break;
-        case Cvideopro:
-        case DvcV6:
-        case Kritter:
-                gspca_dev->ctrl_dis = (1 << GAIN) | (1 << AUTOGAIN);
-                /* fall thru */
-        case Kr651us:
-                sd->ctrls[EXPOSURE].max = 315;
-                sd->ctrls[EXPOSURE].def = 150;
-                break;
-        default:
-                gspca_dev->ctrl_dis = (1 << GAIN) | (1 << EXPOSURE)
-                                         | (1 << AUTOGAIN);
-                break;
-        }
 
-#if AUTOGAIN_DEF
-        if (!(gspca_dev->ctrl_dis & (1 << AUTOGAIN)))
-                gspca_dev->ctrl_inac = (1 << GAIN) | (1 << EXPOSURE);
-#endif
         return gspca_dev->usb_err;
 }
 
@@ -1925,9 +1878,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 break;
         }
 
-        setgain(gspca_dev);
-        setexposure(gspca_dev);
-        setautogain(gspca_dev);
         sd->exp_too_high_cnt = 0;
         sd->exp_too_low_cnt = 0;
         return gspca_dev->usb_err;
@@ -1987,24 +1937,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         }
 }
 
-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->ctrls[AUTOGAIN].val = val;
-        if (val)
-                gspca_dev->ctrl_inac = (1 << GAIN) | (1 << EXPOSURE);
-        else
-                gspca_dev->ctrl_inac = 0;
-        if (gspca_dev->streaming)
-                setautogain(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
-#define WANT_REGULAR_AUTOGAIN
-#define WANT_COARSE_EXPO_AUTOGAIN
-#include "autogain_functions.h"
-
 static void do_autogain(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
@@ -2024,62 +1956,100 @@ static void do_autogain(struct gspca_dev *gspca_dev)
 
         switch (sd->webcam) {
         case P35u:
-                coarse_grained_expo_autogain(gspca_dev, luma, 100, 5);
+                gspca_coarse_grained_expo_autogain(gspca_dev, luma, 100, 5);
                 break;
         default:
-                auto_gain_n_exposure(gspca_dev, luma, 100, 5, 230, 0);
+                gspca_expo_autogain(gspca_dev, luma, 100, 5, 230, 0);
                 break;
         }
 }
 
-/* V4L2 controls supported by the driver */
-static const struct ctrl sd_ctrls[NCTRLS] = {
-[GAIN] = {
-            {
-                .id      = V4L2_CID_GAIN,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Gain",
-                .minimum = 0,
-                .maximum = 253,
-                .step    = 1,
-                .default_value = 128
-            },
-            .set_control = setgain
-        },
-[EXPOSURE] = {
-            {
-                .id      = V4L2_CID_EXPOSURE,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Exposure",
-                .minimum = 0,
-                .maximum = 9,
-                .step    = 1,
-                .default_value = 9
-            },
-            .set_control = setexposure
-        },
-[AUTOGAIN] = {
-            {
-                .id      = V4L2_CID_AUTOGAIN,
-                .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                .name    = "Auto Gain",
-                .minimum = 0,
-                .maximum = 1,
-                .step    = 1,
-                .default_value = AUTOGAIN_DEF,
-                .flags   = V4L2_CTRL_FLAG_UPDATE
-            },
-            .set = sd_setautogain
-        },
+
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+
+        gspca_dev->usb_err = 0;
+
+        if (!gspca_dev->streaming)
+                return 0;
+
+        switch (ctrl->id) {
+        /* autogain/gain/exposure control cluster */
+        case V4L2_CID_AUTOGAIN:
+                if (ctrl->is_new)
+                        setautogain(gspca_dev, ctrl->val);
+                if (!ctrl->val) {
+                        if (gspca_dev->gain->is_new)
+                                setgain(gspca_dev, gspca_dev->gain->val);
+                        if (gspca_dev->exposure->is_new)
+                                setexposure(gspca_dev,
+                                            gspca_dev->exposure->val);
+                }
+                break;
+        /* Some webcams only have exposure, so handle that separately from the
+           autogain/gain/exposure cluster in the previous case. */
+        case V4L2_CID_EXPOSURE:
+                setexposure(gspca_dev, gspca_dev->exposure->val);
+                break;
+        }
+        return gspca_dev->usb_err;
+}
+
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
 };
 
+static int sd_init_controls(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *)gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 3);
+        switch (sd->webcam) {
+        case P35u:
+                gspca_dev->autogain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+                /* For P35u choose coarse expo auto gain function gain minimum,
+                 * to avoid a large settings jump the first auto adjustment */
+                gspca_dev->gain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_GAIN, 0, 127, 1, 127 / 5 * 2);
+                gspca_dev->exposure = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_EXPOSURE, 0, 9, 1, 9);
+                break;
+        case Kr651us:
+                gspca_dev->autogain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+                gspca_dev->gain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_GAIN, 0, 253, 1, 128);
+                /* fall through */
+        case Cvideopro:
+        case DvcV6:
+        case Kritter:
+                gspca_dev->exposure = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_EXPOSURE, 0, 315, 1, 150);
+                break;
+        default:
+                break;
+        }
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+        if (gspca_dev->autogain)
+                v4l2_ctrl_auto_cluster(3, &gspca_dev->autogain, 0, false);
+        return 0;
+}
+
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
         .pkt_scan = sd_pkt_scan,
@@ -2117,6 +2087,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index 183457c5cfdb..bfc7cefa59f8 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -60,25 +60,20 @@ static int frame_rate;
  * are getting "Failed to read sensor ID..." */
 static int i2c_detect_tries = 10;
 
-/* controls */
-enum e_ctrl {
-        BRIGHTNESS,
-        CONTRAST,
-        EXPOSURE,
-        COLORS,
-        HFLIP,
-        VFLIP,
-        AUTOBRIGHT,
-        AUTOGAIN,
-        FREQ,
-        NCTRL           /* number of controls */
-};
-
 /* ov519 device descriptor */
 struct sd {
         struct gspca_dev gspca_dev;             /* !! must be the first item */
 
-        struct gspca_ctrl ctrls[NCTRL];
+        struct v4l2_ctrl *jpegqual;
+        struct v4l2_ctrl *freq;
+        struct { /* h/vflip control cluster */
+                struct v4l2_ctrl *hflip;
+                struct v4l2_ctrl *vflip;
+        };
+        struct { /* autobrightness/brightness control cluster */
+                struct v4l2_ctrl *autobright;
+                struct v4l2_ctrl *brightness;
+        };
 
         u8 packet_nr;
 
@@ -101,7 +96,6 @@ struct sd {
         /* Determined by sensor type */
         u8 sif;
 
-        u8 quality;
 #define QUALITY_MIN 50
 #define QUALITY_MAX 70
 #define QUALITY_DEF 50
@@ -145,209 +139,112 @@ enum sensors {
    really should move the sensor drivers to v4l2 sub drivers. */
 #include "w996Xcf.c"
 
-/* V4L2 controls supported by the driver */
-static void setbrightness(struct gspca_dev *gspca_dev);
-static void setcontrast(struct gspca_dev *gspca_dev);
-static void setexposure(struct gspca_dev *gspca_dev);
-static void setcolors(struct gspca_dev *gspca_dev);
-static void sethvflip(struct gspca_dev *gspca_dev);
-static void setautobright(struct gspca_dev *gspca_dev);
-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val);
-static void setfreq(struct gspca_dev *gspca_dev);
-static void setfreq_i(struct sd *sd);
-
-static const struct ctrl sd_ctrls[] = {
-[BRIGHTNESS] = {
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-                .default_value = 127,
-            },
-            .set_control = setbrightness,
+/* table of the disabled controls */
+struct ctrl_valid {
+        int has_brightness:1;
+        int has_contrast:1;
+        int has_exposure:1;
+        int has_autogain:1;
+        int has_sat:1;
+        int has_hvflip:1;
+        int has_autobright:1;
+        int has_freq:1;
+};
+
+static const struct ctrl_valid valid_controls[] = {
+        [SEN_OV2610] = {
+                .has_exposure = 1,
+                .has_autogain = 1,
         },
-[CONTRAST] = {
-            {
-                .id      = V4L2_CID_CONTRAST,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Contrast",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-                .default_value = 127,
-            },
-            .set_control = setcontrast,
+        [SEN_OV2610AE] = {
+                .has_exposure = 1,
+                .has_autogain = 1,
         },
-[EXPOSURE] = {
-            {
-                .id      = V4L2_CID_EXPOSURE,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Exposure",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-                .default_value = 127,
-            },
-            .set_control = setexposure,
+        [SEN_OV3610] = {
+                /* No controls */
         },
-[COLORS] = {
-            {
-                .id      = V4L2_CID_SATURATION,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Color",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-                .default_value = 127,
-            },
-            .set_control = setcolors,
+        [SEN_OV6620] = {
+                .has_brightness = 1,
+                .has_contrast = 1,
+                .has_sat = 1,
+                .has_autobright = 1,
+                .has_freq = 1,
         },
-/* The flip controls work for sensors ov7660 and ov7670 only */
-[HFLIP] = {
-            {
-                .id      = V4L2_CID_HFLIP,
-                .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                .name    = "Mirror",
-                .minimum = 0,
-                .maximum = 1,
-                .step    = 1,
-                .default_value = 0,
-            },
-            .set_control = sethvflip,
+        [SEN_OV6630] = {
+                .has_brightness = 1,
+                .has_contrast = 1,
+                .has_sat = 1,
+                .has_autobright = 1,
+                .has_freq = 1,
         },
-[VFLIP] = {
-            {
-                .id      = V4L2_CID_VFLIP,
-                .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                .name    = "Vflip",
-                .minimum = 0,
-                .maximum = 1,
-                .step    = 1,
-                .default_value = 0,
-            },
-            .set_control = sethvflip,
+        [SEN_OV66308AF] = {
+                .has_brightness = 1,
+                .has_contrast = 1,
+                .has_sat = 1,
+                .has_autobright = 1,
+                .has_freq = 1,
         },
-[AUTOBRIGHT] = {
-            {
-                .id      = V4L2_CID_AUTOBRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                .name    = "Auto Brightness",
-                .minimum = 0,
-                .maximum = 1,
-                .step    = 1,
-                .default_value = 1,
-            },
-            .set_control = setautobright,
+        [SEN_OV7610] = {
+                .has_brightness = 1,
+                .has_contrast = 1,
+                .has_sat = 1,
+                .has_autobright = 1,
+                .has_freq = 1,
         },
-[AUTOGAIN] = {
-            {
-                .id      = V4L2_CID_AUTOGAIN,
-                .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                .name    = "Auto Gain",
-                .minimum = 0,
-                .maximum = 1,
-                .step    = 1,
-                .default_value = 1,
-                .flags   = V4L2_CTRL_FLAG_UPDATE
-            },
-            .set = sd_setautogain,
+        [SEN_OV7620] = {
+                .has_brightness = 1,
+                .has_contrast = 1,
+                .has_sat = 1,
+                .has_autobright = 1,
+                .has_freq = 1,
         },
-[FREQ] = {
-            {
-                .id      = V4L2_CID_POWER_LINE_FREQUENCY,
-                .type    = V4L2_CTRL_TYPE_MENU,
-                .name    = "Light frequency filter",
-                .minimum = 0,
-                .maximum = 2,   /* 0: no flicker, 1: 50Hz, 2:60Hz, 3: auto */
-                .step    = 1,
-                .default_value = 0,
-            },
-            .set_control = setfreq,
+        [SEN_OV7620AE] = {
+                .has_brightness = 1,
+                .has_contrast = 1,
+                .has_sat = 1,
+                .has_autobright = 1,
+                .has_freq = 1,
+        },
+        [SEN_OV7640] = {
+                .has_brightness = 1,
+                .has_sat = 1,
+                .has_freq = 1,
+        },
+        [SEN_OV7648] = {
+                .has_brightness = 1,
+                .has_sat = 1,
+                .has_freq = 1,
+        },
+        [SEN_OV7660] = {
+                .has_brightness = 1,
+                .has_contrast = 1,
+                .has_sat = 1,
+                .has_hvflip = 1,
+                .has_freq = 1,
+        },
+        [SEN_OV7670] = {
+                .has_brightness = 1,
+                .has_contrast = 1,
+                .has_hvflip = 1,
+                .has_freq = 1,
+        },
+        [SEN_OV76BE] = {
+                .has_brightness = 1,
+                .has_contrast = 1,
+                .has_sat = 1,
+                .has_autobright = 1,
+                .has_freq = 1,
+        },
+        [SEN_OV8610] = {
+                .has_brightness = 1,
+                .has_contrast = 1,
+                .has_sat = 1,
+                .has_autobright = 1,
+        },
+        [SEN_OV9600] = {
+                .has_exposure = 1,
+                .has_autogain = 1,
         },
-};
-
-/* table of the disabled controls */
-static const unsigned ctrl_dis[] = {
-[SEN_OV2610] =          ((1 << NCTRL) - 1)      /* no control */
-                        ^ ((1 << EXPOSURE)      /* but exposure */
-                         | (1 << AUTOGAIN)),    /* and autogain */
-
-[SEN_OV2610AE] =        ((1 << NCTRL) - 1)      /* no control */
-                        ^ ((1 << EXPOSURE)      /* but exposure */
-                         | (1 << AUTOGAIN)),    /* and autogain */
-
-[SEN_OV3610] =          (1 << NCTRL) - 1,       /* no control */
-
-[SEN_OV6620] =          (1 << HFLIP) |
-                        (1 << VFLIP) |
-                        (1 << EXPOSURE) |
-                        (1 << AUTOGAIN),
-
-[SEN_OV6630] =          (1 << HFLIP) |
-                        (1 << VFLIP) |
-                        (1 << EXPOSURE) |
-                        (1 << AUTOGAIN),
-
-[SEN_OV66308AF] =       (1 << HFLIP) |
-                        (1 << VFLIP) |
-                        (1 << EXPOSURE) |
-                        (1 << AUTOGAIN),
-
-[SEN_OV7610] =          (1 << HFLIP) |
-                        (1 << VFLIP) |
-                        (1 << EXPOSURE) |
-                        (1 << AUTOGAIN),
-
-[SEN_OV7620] =          (1 << HFLIP) |
-                        (1 << VFLIP) |
-                        (1 << EXPOSURE) |
-                        (1 << AUTOGAIN),
-
-[SEN_OV7620AE] =        (1 << HFLIP) |
-                        (1 << VFLIP) |
-                        (1 << EXPOSURE) |
-                        (1 << AUTOGAIN),
-
-[SEN_OV7640] =          (1 << HFLIP) |
-                        (1 << VFLIP) |
-                        (1 << AUTOBRIGHT) |
-                        (1 << CONTRAST) |
-                        (1 << EXPOSURE) |
-                        (1 << AUTOGAIN),
-
-[SEN_OV7648] =          (1 << HFLIP) |
-                        (1 << VFLIP) |
-                        (1 << AUTOBRIGHT) |
-                        (1 << CONTRAST) |
-                        (1 << EXPOSURE) |
-                        (1 << AUTOGAIN),
-
-[SEN_OV7660] =          (1 << AUTOBRIGHT) |
-                        (1 << EXPOSURE) |
-                        (1 << AUTOGAIN),
-
-[SEN_OV7670] =          (1 << COLORS) |
-                        (1 << AUTOBRIGHT) |
-                        (1 << EXPOSURE) |
-                        (1 << AUTOGAIN),
-
-[SEN_OV76BE] =          (1 << HFLIP) |
-                        (1 << VFLIP) |
-                        (1 << EXPOSURE) |
-                        (1 << AUTOGAIN),
-
-[SEN_OV8610] =          (1 << HFLIP) |
-                        (1 << VFLIP) |
-                        (1 << EXPOSURE) |
-                        (1 << AUTOGAIN) |
-                        (1 << FREQ),
-[SEN_OV9600] =          ((1 << NCTRL) - 1)      /* no control */
-                        ^ ((1 << EXPOSURE)      /* but exposure */
-                         | (1 << AUTOGAIN)),    /* and autogain */
-
 };
 
 static const struct v4l2_pix_format ov519_vga_mode[] = {
@@ -3306,11 +3203,11 @@ static void ov519_set_fr(struct sd *sd)
         ov518_i2c_w(sd, OV7670_R11_CLKRC, clock);
 }
 
-static void setautogain(struct gspca_dev *gspca_dev)
+static void setautogain(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        i2c_w_mask(sd, 0x13, sd->ctrls[AUTOGAIN].val ? 0x05 : 0x00, 0x05);
+        i2c_w_mask(sd, 0x13, val ? 0x05 : 0x00, 0x05);
 }
 
 /* this function is called at probe time */
@@ -3351,8 +3248,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
                 break;
         }
 
-        gspca_dev->cam.ctrls = sd->ctrls;
-        sd->quality = QUALITY_DEF;
         sd->frame_rate = 15;
 
         return 0;
@@ -3467,8 +3362,6 @@ static int sd_init(struct gspca_dev *gspca_dev)
                 break;
         }
 
-        gspca_dev->ctrl_dis = ctrl_dis[sd->sensor];
-
         /* initialize the sensor */
         switch (sd->sensor) {
         case SEN_OV2610:
@@ -3494,8 +3387,6 @@ static int sd_init(struct gspca_dev *gspca_dev)
                 break;
         case SEN_OV6630:
         case SEN_OV66308AF:
-                sd->ctrls[CONTRAST].def = 200;
-                                 /* The default is too low for the ov6630 */
                 write_i2c_regvals(sd, norm_6x30, ARRAY_SIZE(norm_6x30));
                 break;
         default:
@@ -3522,26 +3413,12 @@ static int sd_init(struct gspca_dev *gspca_dev)
                 sd->gspca_dev.curr_mode = 1;    /* 640x480 */
                 ov519_set_mode(sd);
                 ov519_set_fr(sd);
-                sd->ctrls[COLORS].max = 4;      /* 0..4 */
-                sd->ctrls[COLORS].val =
-                        sd->ctrls[COLORS].def = 2;
-                setcolors(gspca_dev);
-                sd->ctrls[CONTRAST].max = 6;    /* 0..6 */
-                sd->ctrls[CONTRAST].val =
-                        sd->ctrls[CONTRAST].def = 3;
-                setcontrast(gspca_dev);
-                sd->ctrls[BRIGHTNESS].max = 6;  /* 0..6 */
-                sd->ctrls[BRIGHTNESS].val =
-                        sd->ctrls[BRIGHTNESS].def = 3;
-                setbrightness(gspca_dev);
                 sd_reset_snapshot(gspca_dev);
                 ov51x_restart(sd);
                 ov51x_stop(sd);                 /* not in win traces */
                 ov51x_led_control(sd, 0);
                 break;
         case SEN_OV7670:
-                sd->ctrls[FREQ].max = 3;        /* auto */
-                sd->ctrls[FREQ].def = 3;
                 write_i2c_regvals(sd, norm_7670, ARRAY_SIZE(norm_7670));
                 break;
         case SEN_OV8610:
@@ -4177,15 +4054,14 @@ static void mode_init_ov_sensor_regs(struct sd *sd)
 }
 
 /* this function works for bridge ov519 and sensors ov7660 and ov7670 only */
-static void sethvflip(struct gspca_dev *gspca_dev)
+static void sethvflip(struct gspca_dev *gspca_dev, s32 hflip, s32 vflip)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
         if (sd->gspca_dev.streaming)
                 reg_w(sd, OV519_R51_RESET1, 0x0f);      /* block stream */
         i2c_w_mask(sd, OV7670_R1E_MVFP,
-                OV7670_MVFP_MIRROR * sd->ctrls[HFLIP].val
-                        | OV7670_MVFP_VFLIP * sd->ctrls[VFLIP].val,
+                OV7670_MVFP_MIRROR * hflip | OV7670_MVFP_VFLIP * vflip,
                 OV7670_MVFP_MIRROR | OV7670_MVFP_VFLIP);
         if (sd->gspca_dev.streaming)
                 reg_w(sd, OV519_R51_RESET1, 0x00);      /* restart stream */
@@ -4333,23 +4209,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
         set_ov_sensor_window(sd);
 
-        if (!(sd->gspca_dev.ctrl_dis & (1 << CONTRAST)))
-                setcontrast(gspca_dev);
-        if (!(sd->gspca_dev.ctrl_dis & (1 << BRIGHTNESS)))
-                setbrightness(gspca_dev);
-        if (!(sd->gspca_dev.ctrl_dis & (1 << EXPOSURE)))
-                setexposure(gspca_dev);
-        if (!(sd->gspca_dev.ctrl_dis & (1 << COLORS)))
-                setcolors(gspca_dev);
-        if (!(sd->gspca_dev.ctrl_dis & ((1 << HFLIP) | (1 << VFLIP))))
-                sethvflip(gspca_dev);
-        if (!(sd->gspca_dev.ctrl_dis & (1 << AUTOBRIGHT)))
-                setautobright(gspca_dev);
-        if (!(sd->gspca_dev.ctrl_dis & (1 << AUTOGAIN)))
-                setautogain(gspca_dev);
-        if (!(sd->gspca_dev.ctrl_dis & (1 << FREQ)))
-                setfreq_i(sd);
-
         /* Force clear snapshot state in case the snapshot button was
            pressed while we weren't streaming */
         sd->snapshot_needs_reset = 1;
@@ -4605,10 +4464,9 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 
 /* -- management routines -- */
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        int val;
         static const struct ov_i2c_regvals brit_7660[][7] = {
                 {{0x0f, 0x6a}, {0x24, 0x40}, {0x25, 0x2b}, {0x26, 0x90},
                         {0x27, 0xe0}, {0x28, 0xe0}, {0x2c, 0xe0}},
@@ -4626,7 +4484,6 @@ static void setbrightness(struct gspca_dev *gspca_dev)
                         {0x27, 0x60}, {0x28, 0x60}, {0x2c, 0x60}}
         };
 
-        val = sd->ctrls[BRIGHTNESS].val;
         switch (sd->sensor) {
         case SEN_OV8610:
         case SEN_OV7610:
@@ -4640,9 +4497,7 @@ static void setbrightness(struct gspca_dev *gspca_dev)
                 break;
         case SEN_OV7620:
         case SEN_OV7620AE:
-                /* 7620 doesn't like manual changes when in auto mode */
-                if (!sd->ctrls[AUTOBRIGHT].val)
-                        i2c_w(sd, OV7610_REG_BRT, val);
+                i2c_w(sd, OV7610_REG_BRT, val);
                 break;
         case SEN_OV7660:
                 write_i2c_regvals(sd, brit_7660[val],
@@ -4656,10 +4511,9 @@ static void setbrightness(struct gspca_dev *gspca_dev)
         }
 }
 
-static void setcontrast(struct gspca_dev *gspca_dev)
+static void setcontrast(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        int val;
         static const struct ov_i2c_regvals contrast_7660[][31] = {
                 {{0x6c, 0xf0}, {0x6d, 0xf0}, {0x6e, 0xf8}, {0x6f, 0xa0},
                  {0x70, 0x58}, {0x71, 0x38}, {0x72, 0x30}, {0x73, 0x30},
@@ -4719,7 +4573,6 @@ static void setcontrast(struct gspca_dev *gspca_dev)
                  {0x88, 0xf1}, {0x89, 0xf9}, {0x8a, 0xfd}},
         };
 
-        val = sd->ctrls[CONTRAST].val;
         switch (sd->sensor) {
         case SEN_OV7610:
         case SEN_OV6620:
@@ -4760,18 +4613,16 @@ static void setcontrast(struct gspca_dev *gspca_dev)
         }
 }
 
-static void setexposure(struct gspca_dev *gspca_dev)
+static void setexposure(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        if (!sd->ctrls[AUTOGAIN].val)
-                i2c_w(sd, 0x10, sd->ctrls[EXPOSURE].val);
+        i2c_w(sd, 0x10, val);
 }
 
-static void setcolors(struct gspca_dev *gspca_dev)
+static void setcolors(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        int val;
         static const struct ov_i2c_regvals colors_7660[][6] = {
                 {{0x4f, 0x28}, {0x50, 0x2a}, {0x51, 0x02}, {0x52, 0x0a},
                  {0x53, 0x19}, {0x54, 0x23}},
@@ -4785,7 +4636,6 @@ static void setcolors(struct gspca_dev *gspca_dev)
                  {0x53, 0x66}, {0x54, 0x8e}},
         };
 
-        val = sd->ctrls[COLORS].val;
         switch (sd->sensor) {
         case SEN_OV8610:
         case SEN_OV7610:
@@ -4819,34 +4669,18 @@ static void setcolors(struct gspca_dev *gspca_dev)
         }
 }
 
-static void setautobright(struct gspca_dev *gspca_dev)
+static void setautobright(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        i2c_w_mask(sd, 0x2d, sd->ctrls[AUTOBRIGHT].val ? 0x10 : 0x00, 0x10);
+        i2c_w_mask(sd, 0x2d, val ? 0x10 : 0x00, 0x10);
 }
 
-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->ctrls[AUTOGAIN].val = val;
-        if (val) {
-                gspca_dev->ctrl_inac |= (1 << EXPOSURE);
-        } else {
-                gspca_dev->ctrl_inac &= ~(1 << EXPOSURE);
-                sd->ctrls[EXPOSURE].val = i2c_r(sd, 0x10);
-        }
-        if (gspca_dev->streaming)
-                setautogain(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
-static void setfreq_i(struct sd *sd)
+static void setfreq_i(struct sd *sd, s32 val)
 {
         if (sd->sensor == SEN_OV7660
          || sd->sensor == SEN_OV7670) {
-                switch (sd->ctrls[FREQ].val) {
+                switch (val) {
                 case 0: /* Banding filter disabled */
                         i2c_w_mask(sd, OV7670_R13_COM8, 0, OV7670_COM8_BFILT);
                         break;
@@ -4868,7 +4702,7 @@ static void setfreq_i(struct sd *sd)
                         break;
                 }
         } else {
-                switch (sd->ctrls[FREQ].val) {
+                switch (val) {
                 case 0: /* Banding filter disabled */
                         i2c_w_mask(sd, 0x2d, 0x00, 0x04);
                         i2c_w_mask(sd, 0x2a, 0x00, 0x80);
@@ -4900,56 +4734,28 @@ static void setfreq_i(struct sd *sd)
                 }
         }
 }
-static void setfreq(struct gspca_dev *gspca_dev)
+
+static void setfreq(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        setfreq_i(sd);
+        setfreq_i(sd, val);
 
         /* Ugly but necessary */
         if (sd->bridge == BRIDGE_W9968CF)
                 w9968cf_set_crop_window(sd);
 }
 
-static int sd_querymenu(struct gspca_dev *gspca_dev,
-                        struct v4l2_querymenu *menu)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        switch (menu->id) {
-        case V4L2_CID_POWER_LINE_FREQUENCY:
-                switch (menu->index) {
-                case 0:         /* V4L2_CID_POWER_LINE_FREQUENCY_DISABLED */
-                        strcpy((char *) menu->name, "NoFliker");
-                        return 0;
-                case 1:         /* V4L2_CID_POWER_LINE_FREQUENCY_50HZ */
-                        strcpy((char *) menu->name, "50 Hz");
-                        return 0;
-                case 2:         /* V4L2_CID_POWER_LINE_FREQUENCY_60HZ */
-                        strcpy((char *) menu->name, "60 Hz");
-                        return 0;
-                case 3:
-                        if (sd->sensor != SEN_OV7670)
-                                return -EINVAL;
-
-                        strcpy((char *) menu->name, "Automatic");
-                        return 0;
-                }
-                break;
-        }
-        return -EINVAL;
-}
-
 static int sd_get_jcomp(struct gspca_dev *gspca_dev,
                         struct v4l2_jpegcompression *jcomp)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
         if (sd->bridge != BRIDGE_W9968CF)
-                return -EINVAL;
+                return -ENOTTY;
 
         memset(jcomp, 0, sizeof *jcomp);
-        jcomp->quality = sd->quality;
+        jcomp->quality = v4l2_ctrl_g_ctrl(sd->jpegqual);
         jcomp->jpeg_markers = V4L2_JPEG_MARKER_DHT | V4L2_JPEG_MARKER_DQT |
                               V4L2_JPEG_MARKER_DRI;
         return 0;
@@ -4961,38 +4767,161 @@ static int sd_set_jcomp(struct gspca_dev *gspca_dev,
         struct sd *sd = (struct sd *) gspca_dev;
 
         if (sd->bridge != BRIDGE_W9968CF)
-                return -EINVAL;
+                return -ENOTTY;
+
+        v4l2_ctrl_s_ctrl(sd->jpegqual, jcomp->quality);
+        return 0;
+}
 
-        if (gspca_dev->streaming)
-                return -EBUSY;
+static int sd_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
 
-        if (jcomp->quality < QUALITY_MIN)
-                sd->quality = QUALITY_MIN;
-        else if (jcomp->quality > QUALITY_MAX)
-                sd->quality = QUALITY_MAX;
-        else
-                sd->quality = jcomp->quality;
+        gspca_dev->usb_err = 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_AUTOGAIN:
+                gspca_dev->exposure->val = i2c_r(sd, 0x10);
+                break;
+        }
+        return 0;
+}
+
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
+
+        gspca_dev->usb_err = 0;
+
+        if (!gspca_dev->streaming)
+                return 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                setcontrast(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_POWER_LINE_FREQUENCY:
+                setfreq(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_AUTOBRIGHTNESS:
+                if (ctrl->is_new)
+                        setautobright(gspca_dev, ctrl->val);
+                if (!ctrl->val && sd->brightness->is_new)
+                        setbrightness(gspca_dev, sd->brightness->val);
+                break;
+        case V4L2_CID_SATURATION:
+                setcolors(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_HFLIP:
+                sethvflip(gspca_dev, ctrl->val, sd->vflip->val);
+                break;
+        case V4L2_CID_AUTOGAIN:
+                if (ctrl->is_new)
+                        setautogain(gspca_dev, ctrl->val);
+                if (!ctrl->val && gspca_dev->exposure->is_new)
+                        setexposure(gspca_dev, gspca_dev->exposure->val);
+                break;
+        case V4L2_CID_JPEG_COMPRESSION_QUALITY:
+                return -EBUSY; /* Should never happen, as we grab the ctrl */
+        }
+        return gspca_dev->usb_err;
+}
 
-        /* Return resulting jcomp params to app */
-        sd_get_jcomp(gspca_dev, jcomp);
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .g_volatile_ctrl = sd_g_volatile_ctrl,
+        .s_ctrl = sd_s_ctrl,
+};
+
+static int sd_init_controls(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *)gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 10);
+        if (valid_controls[sd->sensor].has_brightness)
+                sd->brightness = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0,
+                        sd->sensor == SEN_OV7660 ? 6 : 255, 1,
+                        sd->sensor == SEN_OV7660 ? 3 : 127);
+        if (valid_controls[sd->sensor].has_contrast) {
+                if (sd->sensor == SEN_OV7660)
+                        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                V4L2_CID_CONTRAST, 0, 6, 1, 3);
+                else
+                        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                V4L2_CID_CONTRAST, 0, 255, 1,
+                                (sd->sensor == SEN_OV6630 ||
+                                 sd->sensor == SEN_OV66308AF) ? 200 : 127);
+        }
+        if (valid_controls[sd->sensor].has_sat)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SATURATION, 0,
+                        sd->sensor == SEN_OV7660 ? 4 : 255, 1,
+                        sd->sensor == SEN_OV7660 ? 2 : 127);
+        if (valid_controls[sd->sensor].has_exposure)
+                gspca_dev->exposure = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_EXPOSURE, 0, 255, 1, 127);
+        if (valid_controls[sd->sensor].has_hvflip) {
+                sd->hflip = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_HFLIP, 0, 1, 1, 0);
+                sd->vflip = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_VFLIP, 0, 1, 1, 0);
+        }
+        if (valid_controls[sd->sensor].has_autobright)
+                sd->autobright = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_AUTOBRIGHTNESS, 0, 1, 1, 1);
+        if (valid_controls[sd->sensor].has_autogain)
+                gspca_dev->autogain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+        if (valid_controls[sd->sensor].has_freq) {
+                if (sd->sensor == SEN_OV7670)
+                        sd->freq = v4l2_ctrl_new_std_menu(hdl, &sd_ctrl_ops,
+                                V4L2_CID_POWER_LINE_FREQUENCY,
+                                V4L2_CID_POWER_LINE_FREQUENCY_AUTO, 0,
+                                V4L2_CID_POWER_LINE_FREQUENCY_AUTO);
+                else
+                        sd->freq = v4l2_ctrl_new_std_menu(hdl, &sd_ctrl_ops,
+                                V4L2_CID_POWER_LINE_FREQUENCY,
+                                V4L2_CID_POWER_LINE_FREQUENCY_60HZ, 0, 0);
+        }
+        if (sd->bridge == BRIDGE_W9968CF)
+                sd->jpegqual = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_JPEG_COMPRESSION_QUALITY,
+                        QUALITY_MIN, QUALITY_MAX, 1, QUALITY_DEF);
 
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+        if (gspca_dev->autogain)
+                v4l2_ctrl_auto_cluster(3, &gspca_dev->autogain, 0, true);
+        if (sd->autobright)
+                v4l2_ctrl_auto_cluster(2, &sd->autobright, 0, false);
+        if (sd->hflip)
+                v4l2_ctrl_cluster(2, &sd->hflip);
         return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .isoc_init = sd_isoc_init,
         .start = sd_start,
         .stopN = sd_stopN,
         .stop0 = sd_stop0,
         .pkt_scan = sd_pkt_scan,
         .dq_callback = sd_reset_snapshot,
-        .querymenu = sd_querymenu,
         .get_jcomp = sd_get_jcomp,
         .set_jcomp = sd_set_jcomp,
 #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
@@ -5052,6 +4981,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c
index 80c81dd6d68b..bb09d7884b89 100644
--- a/drivers/media/video/gspca/ov534.c
+++ b/drivers/media/video/gspca/ov534.c
@@ -35,6 +35,7 @@
 #include "gspca.h"
 
 #include <linux/fixp-arith.h>
+#include <media/v4l2-ctrls.h>
 
 #define OV534_REG_ADDRESS       0xf1    /* sensor address */
 #define OV534_REG_SUBADDR       0xf2
@@ -53,29 +54,28 @@ MODULE_AUTHOR("Antonio Ospite <ospite@studenti.unina.it>");
 MODULE_DESCRIPTION("GSPCA/OV534 USB Camera Driver");
 MODULE_LICENSE("GPL");
 
-/* controls */
-enum e_ctrl {
-        HUE,
-        SATURATION,
-        BRIGHTNESS,
-        CONTRAST,
-        GAIN,
-        EXPOSURE,
-        AGC,
-        AWB,
-        AEC,
-        SHARPNESS,
-        HFLIP,
-        VFLIP,
-        LIGHTFREQ,
-        NCTRLS          /* number of controls */
-};
-
 /* specific webcam descriptor */
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
 
-        struct gspca_ctrl ctrls[NCTRLS];
+        struct v4l2_ctrl_handler ctrl_handler;
+        struct v4l2_ctrl *hue;
+        struct v4l2_ctrl *saturation;
+        struct v4l2_ctrl *brightness;
+        struct v4l2_ctrl *contrast;
+        struct { /* gain control cluster */
+                struct v4l2_ctrl *autogain;
+                struct v4l2_ctrl *gain;
+        };
+        struct v4l2_ctrl *autowhitebalance;
+        struct { /* exposure control cluster */
+                struct v4l2_ctrl *autoexposure;
+                struct v4l2_ctrl *exposure;
+        };
+        struct v4l2_ctrl *sharpness;
+        struct v4l2_ctrl *hflip;
+        struct v4l2_ctrl *vflip;
+        struct v4l2_ctrl *plfreq;
 
         __u32 last_pts;
         u16 last_fid;
@@ -89,181 +89,9 @@ enum sensors {
         NSENSORS
 };
 
-/* V4L2 controls supported by the driver */
-static void sethue(struct gspca_dev *gspca_dev);
-static void setsaturation(struct gspca_dev *gspca_dev);
-static void setbrightness(struct gspca_dev *gspca_dev);
-static void setcontrast(struct gspca_dev *gspca_dev);
-static void setgain(struct gspca_dev *gspca_dev);
-static void setexposure(struct gspca_dev *gspca_dev);
-static void setagc(struct gspca_dev *gspca_dev);
-static void setawb(struct gspca_dev *gspca_dev);
-static void setaec(struct gspca_dev *gspca_dev);
-static void setsharpness(struct gspca_dev *gspca_dev);
-static void sethvflip(struct gspca_dev *gspca_dev);
-static void setlightfreq(struct gspca_dev *gspca_dev);
-
 static int sd_start(struct gspca_dev *gspca_dev);
 static void sd_stopN(struct gspca_dev *gspca_dev);
 
-static const struct ctrl sd_ctrls[] = {
-[HUE] = {
-                {
-                        .id      = V4L2_CID_HUE,
-                        .type    = V4L2_CTRL_TYPE_INTEGER,
-                        .name    = "Hue",
-                        .minimum = -90,
-                        .maximum = 90,
-                        .step    = 1,
-                        .default_value = 0,
-                },
-                .set_control = sethue
-        },
-[SATURATION] = {
-                {
-                        .id      = V4L2_CID_SATURATION,
-                        .type    = V4L2_CTRL_TYPE_INTEGER,
-                        .name    = "Saturation",
-                        .minimum = 0,
-                        .maximum = 255,
-                        .step    = 1,
-                        .default_value = 64,
-                },
-                .set_control = setsaturation
-        },
-[BRIGHTNESS] = {
-                {
-                        .id      = V4L2_CID_BRIGHTNESS,
-                        .type    = V4L2_CTRL_TYPE_INTEGER,
-                        .name    = "Brightness",
-                        .minimum = 0,
-                        .maximum = 255,
-                        .step    = 1,
-                        .default_value = 0,
-                },
-                .set_control = setbrightness
-        },
-[CONTRAST] = {
-                {
-                        .id      = V4L2_CID_CONTRAST,
-                        .type    = V4L2_CTRL_TYPE_INTEGER,
-                        .name    = "Contrast",
-                        .minimum = 0,
-                        .maximum = 255,
-                        .step    = 1,
-                        .default_value = 32,
-                },
-                .set_control = setcontrast
-        },
-[GAIN] = {
-                {
-                        .id      = V4L2_CID_GAIN,
-                        .type    = V4L2_CTRL_TYPE_INTEGER,
-                        .name    = "Main Gain",
-                        .minimum = 0,
-                        .maximum = 63,
-                        .step    = 1,
-                        .default_value = 20,
-                },
-                .set_control = setgain
-        },
-[EXPOSURE] = {
-                {
-                        .id      = V4L2_CID_EXPOSURE,
-                        .type    = V4L2_CTRL_TYPE_INTEGER,
-                        .name    = "Exposure",
-                        .minimum = 0,
-                        .maximum = 255,
-                        .step    = 1,
-                        .default_value = 120,
-                },
-                .set_control = setexposure
-        },
-[AGC] = {
-                {
-                        .id      = V4L2_CID_AUTOGAIN,
-                        .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name    = "Auto Gain",
-                        .minimum = 0,
-                        .maximum = 1,
-                        .step    = 1,
-                        .default_value = 1,
-                },
-                .set_control = setagc
-        },
-[AWB] = {
-                {
-                        .id      = V4L2_CID_AUTO_WHITE_BALANCE,
-                        .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name    = "Auto White Balance",
-                        .minimum = 0,
-                        .maximum = 1,
-                        .step    = 1,
-                        .default_value = 1,
-                },
-                .set_control = setawb
-        },
-[AEC] = {
-                {
-                        .id      = V4L2_CID_EXPOSURE_AUTO,
-                        .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name    = "Auto Exposure",
-                        .minimum = 0,
-                        .maximum = 1,
-                        .step    = 1,
-                        .default_value = 1,
-                },
-                .set_control = setaec
-        },
-[SHARPNESS] = {
-                {
-                        .id      = V4L2_CID_SHARPNESS,
-                        .type    = V4L2_CTRL_TYPE_INTEGER,
-                        .name    = "Sharpness",
-                        .minimum = 0,
-                        .maximum = 63,
-                        .step    = 1,
-                        .default_value = 0,
-                },
-                .set_control = setsharpness
-        },
-[HFLIP] = {
-                {
-                        .id      = V4L2_CID_HFLIP,
-                        .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name    = "HFlip",
-                        .minimum = 0,
-                        .maximum = 1,
-                        .step    = 1,
-                        .default_value = 0,
-                },
-                .set_control = sethvflip
-        },
-[VFLIP] = {
-                {
-                        .id      = V4L2_CID_VFLIP,
-                        .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name    = "VFlip",
-                        .minimum = 0,
-                        .maximum = 1,
-                        .step    = 1,
-                        .default_value = 0,
-                },
-                .set_control = sethvflip
-        },
-[LIGHTFREQ] = {
-                {
-                        .id      = V4L2_CID_POWER_LINE_FREQUENCY,
-                        .type    = V4L2_CTRL_TYPE_MENU,
-                        .name    = "Light Frequency Filter",
-                        .minimum = 0,
-                        .maximum = 1,
-                        .step    = 1,
-                        .default_value = 0,
-                },
-                .set_control = setlightfreq
-        },
-};
 
 static const struct v4l2_pix_format ov772x_mode[] = {
         {320, 240, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
@@ -972,12 +800,10 @@ static void set_frame_rate(struct gspca_dev *gspca_dev)
         PDEBUG(D_PROBE, "frame_rate: %d", r->fps);
 }
 
-static void sethue(struct gspca_dev *gspca_dev)
+static void sethue(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        int val;
 
-        val = sd->ctrls[HUE].val;
         if (sd->sensor == SENSOR_OV767x) {
                 /* TBD */
         } else {
@@ -1014,12 +840,10 @@ static void sethue(struct gspca_dev *gspca_dev)
         }
 }
 
-static void setsaturation(struct gspca_dev *gspca_dev)
+static void setsaturation(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        int val;
 
-        val = sd->ctrls[SATURATION].val;
         if (sd->sensor == SENSOR_OV767x) {
                 int i;
                 static u8 color_tb[][6] = {
@@ -1040,12 +864,10 @@ static void setsaturation(struct gspca_dev *gspca_dev)
         }
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        int val;
 
-        val = sd->ctrls[BRIGHTNESS].val;
         if (sd->sensor == SENSOR_OV767x) {
                 if (val < 0)
                         val = 0x80 - val;
@@ -1055,27 +877,18 @@ static void setbrightness(struct gspca_dev *gspca_dev)
         }
 }
 
-static void setcontrast(struct gspca_dev *gspca_dev)
+static void setcontrast(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        u8 val;
 
-        val = sd->ctrls[CONTRAST].val;
         if (sd->sensor == SENSOR_OV767x)
                 sccb_reg_write(gspca_dev, 0x56, val);   /* contras */
         else
                 sccb_reg_write(gspca_dev, 0x9c, val);
 }
 
-static void setgain(struct gspca_dev *gspca_dev)
+static void setgain(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        u8 val;
-
-        if (sd->ctrls[AGC].val)
-                return;
-
-        val = sd->ctrls[GAIN].val;
         switch (val & 0x30) {
         case 0x00:
                 val &= 0x0f;
@@ -1097,15 +910,15 @@ static void setgain(struct gspca_dev *gspca_dev)
         sccb_reg_write(gspca_dev, 0x00, val);
 }
 
-static void setexposure(struct gspca_dev *gspca_dev)
+static s32 getgain(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        u8 val;
+        return sccb_reg_read(gspca_dev, 0x00);
+}
 
-        if (sd->ctrls[AEC].val)
-                return;
+static void setexposure(struct gspca_dev *gspca_dev, s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
 
-        val = sd->ctrls[EXPOSURE].val;
         if (sd->sensor == SENSOR_OV767x) {
 
                 /* set only aec[9:2] */
@@ -1123,11 +936,23 @@ static void setexposure(struct gspca_dev *gspca_dev)
         }
 }
 
-static void setagc(struct gspca_dev *gspca_dev)
+static s32 getexposure(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        if (sd->ctrls[AGC].val) {
+        if (sd->sensor == SENSOR_OV767x) {
+                /* get only aec[9:2] */
+                return sccb_reg_read(gspca_dev, 0x10);  /* aech */
+        } else {
+                u8 hi = sccb_reg_read(gspca_dev, 0x08);
+                u8 lo = sccb_reg_read(gspca_dev, 0x10);
+                return (hi << 8 | lo) >> 1;
+        }
+}
+
+static void setagc(struct gspca_dev *gspca_dev, s32 val)
+{
+        if (val) {
                 sccb_reg_write(gspca_dev, 0x13,
                                 sccb_reg_read(gspca_dev, 0x13) | 0x04);
                 sccb_reg_write(gspca_dev, 0x64,
@@ -1137,16 +962,14 @@ static void setagc(struct gspca_dev *gspca_dev)
                                 sccb_reg_read(gspca_dev, 0x13) & ~0x04);
                 sccb_reg_write(gspca_dev, 0x64,
                                 sccb_reg_read(gspca_dev, 0x64) & ~0x03);
-
-                setgain(gspca_dev);
         }
 }
 
-static void setawb(struct gspca_dev *gspca_dev)
+static void setawb(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        if (sd->ctrls[AWB].val) {
+        if (val) {
                 sccb_reg_write(gspca_dev, 0x13,
                                 sccb_reg_read(gspca_dev, 0x13) | 0x02);
                 if (sd->sensor == SENSOR_OV772x)
@@ -1161,7 +984,7 @@ static void setawb(struct gspca_dev *gspca_dev)
         }
 }
 
-static void setaec(struct gspca_dev *gspca_dev)
+static void setaec(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u8 data;
@@ -1169,31 +992,25 @@ static void setaec(struct gspca_dev *gspca_dev)
         data = sd->sensor == SENSOR_OV767x ?
                         0x05 :          /* agc + aec */
                         0x01;           /* agc */
-        if (sd->ctrls[AEC].val)
+        switch (val) {
+        case V4L2_EXPOSURE_AUTO:
                 sccb_reg_write(gspca_dev, 0x13,
                                 sccb_reg_read(gspca_dev, 0x13) | data);
-        else {
+                break;
+        case V4L2_EXPOSURE_MANUAL:
                 sccb_reg_write(gspca_dev, 0x13,
                                 sccb_reg_read(gspca_dev, 0x13) & ~data);
-                if (sd->sensor == SENSOR_OV767x)
-                        sd->ctrls[EXPOSURE].val =
-                                sccb_reg_read(gspca_dev, 10);   /* aech */
-                else
-                        setexposure(gspca_dev);
+                break;
         }
 }
 
-static void setsharpness(struct gspca_dev *gspca_dev)
+static void setsharpness(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        u8 val;
-
-        val = sd->ctrls[SHARPNESS].val;
         sccb_reg_write(gspca_dev, 0x91, val);   /* Auto de-noise threshold */
         sccb_reg_write(gspca_dev, 0x8e, val);   /* De-noise threshold */
 }
 
-static void sethvflip(struct gspca_dev *gspca_dev)
+static void sethvflip(struct gspca_dev *gspca_dev, s32 hflip, s32 vflip)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u8 val;
@@ -1201,28 +1018,27 @@ static void sethvflip(struct gspca_dev *gspca_dev)
         if (sd->sensor == SENSOR_OV767x) {
                 val = sccb_reg_read(gspca_dev, 0x1e);   /* mvfp */
                 val &= ~0x30;
-                if (sd->ctrls[HFLIP].val)
+                if (hflip)
                         val |= 0x20;
-                if (sd->ctrls[VFLIP].val)
+                if (vflip)
                         val |= 0x10;
                 sccb_reg_write(gspca_dev, 0x1e, val);
         } else {
                 val = sccb_reg_read(gspca_dev, 0x0c);
                 val &= ~0xc0;
-                if (sd->ctrls[HFLIP].val == 0)
+                if (hflip == 0)
                         val |= 0x40;
-                if (sd->ctrls[VFLIP].val == 0)
+                if (vflip == 0)
                         val |= 0x80;
                 sccb_reg_write(gspca_dev, 0x0c, val);
         }
 }
 
-static void setlightfreq(struct gspca_dev *gspca_dev)
+static void setlightfreq(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        u8 val;
 
-        val = sd->ctrls[LIGHTFREQ].val ? 0x9e : 0x00;
+        val = val ? 0x9e : 0x00;
         if (sd->sensor == SENSOR_OV767x) {
                 sccb_reg_write(gspca_dev, 0x2a, 0x00);
                 if (val)
@@ -1241,8 +1057,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
 
         cam = &gspca_dev->cam;
 
-        cam->ctrls = sd->ctrls;
-
         cam->cam_mode = ov772x_mode;
         cam->nmodes = ARRAY_SIZE(ov772x_mode);
 
@@ -1251,6 +1065,195 @@ static int sd_config(struct gspca_dev *gspca_dev,
         return 0;
 }
 
+static int ov534_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct sd *sd = container_of(ctrl->handler, struct sd, ctrl_handler);
+        struct gspca_dev *gspca_dev = &sd->gspca_dev;
+
+        switch (ctrl->id) {
+        case V4L2_CID_AUTOGAIN:
+                gspca_dev->usb_err = 0;
+                if (ctrl->val && sd->gain && gspca_dev->streaming)
+                        sd->gain->val = getgain(gspca_dev);
+                return gspca_dev->usb_err;
+
+        case V4L2_CID_EXPOSURE_AUTO:
+                gspca_dev->usb_err = 0;
+                if (ctrl->val == V4L2_EXPOSURE_AUTO && sd->exposure &&
+                    gspca_dev->streaming)
+                        sd->exposure->val = getexposure(gspca_dev);
+                return gspca_dev->usb_err;
+        }
+        return -EINVAL;
+}
+
+static int ov534_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct sd *sd = container_of(ctrl->handler, struct sd, ctrl_handler);
+        struct gspca_dev *gspca_dev = &sd->gspca_dev;
+
+        gspca_dev->usb_err = 0;
+        if (!gspca_dev->streaming)
+                return 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_HUE:
+                sethue(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_SATURATION:
+                setsaturation(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                setcontrast(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_AUTOGAIN:
+        /* case V4L2_CID_GAIN: */
+                setagc(gspca_dev, ctrl->val);
+                if (!gspca_dev->usb_err && !ctrl->val && sd->gain)
+                        setgain(gspca_dev, sd->gain->val);
+                break;
+        case V4L2_CID_AUTO_WHITE_BALANCE:
+                setawb(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_EXPOSURE_AUTO:
+        /* case V4L2_CID_EXPOSURE: */
+                setaec(gspca_dev, ctrl->val);
+                if (!gspca_dev->usb_err && ctrl->val == V4L2_EXPOSURE_MANUAL &&
+                    sd->exposure)
+                        setexposure(gspca_dev, sd->exposure->val);
+                break;
+        case V4L2_CID_SHARPNESS:
+                setsharpness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_HFLIP:
+                sethvflip(gspca_dev, ctrl->val, sd->vflip->val);
+                break;
+        case V4L2_CID_VFLIP:
+                sethvflip(gspca_dev, sd->hflip->val, ctrl->val);
+                break;
+        case V4L2_CID_POWER_LINE_FREQUENCY:
+                setlightfreq(gspca_dev, ctrl->val);
+                break;
+        }
+        return gspca_dev->usb_err;
+}
+
+static const struct v4l2_ctrl_ops ov534_ctrl_ops = {
+        .g_volatile_ctrl = ov534_g_volatile_ctrl,
+        .s_ctrl = ov534_s_ctrl,
+};
+
+static int sd_init_controls(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &sd->ctrl_handler;
+        /* parameters with different values between the supported sensors */
+        int saturation_min;
+        int saturation_max;
+        int saturation_def;
+        int brightness_min;
+        int brightness_max;
+        int brightness_def;
+        int contrast_max;
+        int contrast_def;
+        int exposure_min;
+        int exposure_max;
+        int exposure_def;
+        int hflip_def;
+
+        if (sd->sensor == SENSOR_OV767x) {
+                saturation_min = 0,
+                saturation_max = 6,
+                saturation_def = 3,
+                brightness_min = -127;
+                brightness_max = 127;
+                brightness_def = 0;
+                contrast_max = 0x80;
+                contrast_def = 0x40;
+                exposure_min = 0x08;
+                exposure_max = 0x60;
+                exposure_def = 0x13;
+                hflip_def = 1;
+        } else {
+                saturation_min = 0,
+                saturation_max = 255,
+                saturation_def = 64,
+                brightness_min = 0;
+                brightness_max = 255;
+                brightness_def = 0;
+                contrast_max = 255;
+                contrast_def = 32;
+                exposure_min = 0;
+                exposure_max = 255;
+                exposure_def = 120;
+                hflip_def = 0;
+        }
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+
+        v4l2_ctrl_handler_init(hdl, 13);
+
+        if (sd->sensor == SENSOR_OV772x)
+                sd->hue = v4l2_ctrl_new_std(hdl, &ov534_ctrl_ops,
+                                V4L2_CID_HUE, -90, 90, 1, 0);
+
+        sd->saturation = v4l2_ctrl_new_std(hdl, &ov534_ctrl_ops,
+                        V4L2_CID_SATURATION, saturation_min, saturation_max, 1,
+                        saturation_def);
+        sd->brightness = v4l2_ctrl_new_std(hdl, &ov534_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, brightness_min, brightness_max, 1,
+                        brightness_def);
+        sd->contrast = v4l2_ctrl_new_std(hdl, &ov534_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, contrast_max, 1, contrast_def);
+
+        if (sd->sensor == SENSOR_OV772x) {
+                sd->autogain = v4l2_ctrl_new_std(hdl, &ov534_ctrl_ops,
+                                V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+                sd->gain = v4l2_ctrl_new_std(hdl, &ov534_ctrl_ops,
+                                V4L2_CID_GAIN, 0, 63, 1, 20);
+        }
+
+        sd->autoexposure = v4l2_ctrl_new_std_menu(hdl, &ov534_ctrl_ops,
+                        V4L2_CID_EXPOSURE_AUTO,
+                        V4L2_EXPOSURE_MANUAL, 0,
+                        V4L2_EXPOSURE_AUTO);
+        sd->exposure = v4l2_ctrl_new_std(hdl, &ov534_ctrl_ops,
+                        V4L2_CID_EXPOSURE, exposure_min, exposure_max, 1,
+                        exposure_def);
+
+        sd->autowhitebalance = v4l2_ctrl_new_std(hdl, &ov534_ctrl_ops,
+                        V4L2_CID_AUTO_WHITE_BALANCE, 0, 1, 1, 1);
+
+        if (sd->sensor == SENSOR_OV772x)
+                sd->sharpness = v4l2_ctrl_new_std(hdl, &ov534_ctrl_ops,
+                                V4L2_CID_SHARPNESS, 0, 63, 1, 0);
+
+        sd->hflip = v4l2_ctrl_new_std(hdl, &ov534_ctrl_ops,
+                        V4L2_CID_HFLIP, 0, 1, 1, hflip_def);
+        sd->vflip = v4l2_ctrl_new_std(hdl, &ov534_ctrl_ops,
+                        V4L2_CID_VFLIP, 0, 1, 1, 0);
+        sd->plfreq = v4l2_ctrl_new_std_menu(hdl, &ov534_ctrl_ops,
+                        V4L2_CID_POWER_LINE_FREQUENCY,
+                        V4L2_CID_POWER_LINE_FREQUENCY_50HZ, 0,
+                        V4L2_CID_POWER_LINE_FREQUENCY_DISABLED);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+
+        if (sd->sensor == SENSOR_OV772x)
+                v4l2_ctrl_auto_cluster(2, &sd->autogain, 0, true);
+
+        v4l2_ctrl_auto_cluster(2, &sd->autoexposure, V4L2_EXPOSURE_MANUAL,
+                               true);
+
+        return 0;
+}
+
 /* this function is called at probe and resume time */
 static int sd_init(struct gspca_dev *gspca_dev)
 {
@@ -1286,24 +1289,6 @@ static int sd_init(struct gspca_dev *gspca_dev)
 
         if ((sensor_id & 0xfff0) == 0x7670) {
                 sd->sensor = SENSOR_OV767x;
-                gspca_dev->ctrl_dis = (1 << HUE) |
-                                        (1 << GAIN) |
-                                        (1 << AGC) |
-                                        (1 << SHARPNESS);       /* auto */
-                sd->ctrls[SATURATION].min = 0,
-                sd->ctrls[SATURATION].max = 6,
-                sd->ctrls[SATURATION].def = 3,
-                sd->ctrls[BRIGHTNESS].min = -127;
-                sd->ctrls[BRIGHTNESS].max = 127;
-                sd->ctrls[BRIGHTNESS].def = 0;
-                sd->ctrls[CONTRAST].max = 0x80;
-                sd->ctrls[CONTRAST].def = 0x40;
-                sd->ctrls[EXPOSURE].min = 0x08;
-                sd->ctrls[EXPOSURE].max = 0x60;
-                sd->ctrls[EXPOSURE].def = 0x13;
-                sd->ctrls[SHARPNESS].max = 9;
-                sd->ctrls[SHARPNESS].def = 4;
-                sd->ctrls[HFLIP].def = 1;
                 gspca_dev->cam.cam_mode = ov767x_mode;
                 gspca_dev->cam.nmodes = ARRAY_SIZE(ov767x_mode);
         } else {
@@ -1366,22 +1351,23 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
         set_frame_rate(gspca_dev);
 
-        if (!(gspca_dev->ctrl_dis & (1 << HUE)))
-                sethue(gspca_dev);
-        setsaturation(gspca_dev);
-        if (!(gspca_dev->ctrl_dis & (1 << AGC)))
-                setagc(gspca_dev);
-        setawb(gspca_dev);
-        setaec(gspca_dev);
-        if (!(gspca_dev->ctrl_dis & (1 << GAIN)))
-                setgain(gspca_dev);
-        setexposure(gspca_dev);
-        setbrightness(gspca_dev);
-        setcontrast(gspca_dev);
-        if (!(gspca_dev->ctrl_dis & (1 << SHARPNESS)))
-                setsharpness(gspca_dev);
-        sethvflip(gspca_dev);
-        setlightfreq(gspca_dev);
+        if (sd->hue)
+                sethue(gspca_dev, v4l2_ctrl_g_ctrl(sd->hue));
+        setsaturation(gspca_dev, v4l2_ctrl_g_ctrl(sd->saturation));
+        if (sd->autogain)
+                setagc(gspca_dev, v4l2_ctrl_g_ctrl(sd->autogain));
+        setawb(gspca_dev, v4l2_ctrl_g_ctrl(sd->autowhitebalance));
+        setaec(gspca_dev, v4l2_ctrl_g_ctrl(sd->autoexposure));
+        if (sd->gain)
+                setgain(gspca_dev, v4l2_ctrl_g_ctrl(sd->gain));
+        setexposure(gspca_dev, v4l2_ctrl_g_ctrl(sd->exposure));
+        setbrightness(gspca_dev, v4l2_ctrl_g_ctrl(sd->brightness));
+        setcontrast(gspca_dev, v4l2_ctrl_g_ctrl(sd->contrast));
+        if (sd->sharpness)
+                setsharpness(gspca_dev, v4l2_ctrl_g_ctrl(sd->sharpness));
+        sethvflip(gspca_dev, v4l2_ctrl_g_ctrl(sd->hflip),
+                  v4l2_ctrl_g_ctrl(sd->vflip));
+        setlightfreq(gspca_dev, v4l2_ctrl_g_ctrl(sd->plfreq));
 
         ov534_set_led(gspca_dev, 1);
         ov534_reg_write(gspca_dev, 0xe0, 0x00);
@@ -1483,25 +1469,6 @@ scan_next:
         } while (remaining_len > 0);
 }
 
-static int sd_querymenu(struct gspca_dev *gspca_dev,
-                struct v4l2_querymenu *menu)
-{
-        switch (menu->id) {
-        case V4L2_CID_POWER_LINE_FREQUENCY:
-                switch (menu->index) {
-                case 0:         /* V4L2_CID_POWER_LINE_FREQUENCY_DISABLED */
-                        strcpy((char *) menu->name, "Disabled");
-                        return 0;
-                case 1:         /* V4L2_CID_POWER_LINE_FREQUENCY_50HZ */
-                        strcpy((char *) menu->name, "50 Hz");
-                        return 0;
-                }
-                break;
-        }
-
-        return -EINVAL;
-}
-
 /* get stream parameters (framerate) */
 static void sd_get_streamparm(struct gspca_dev *gspca_dev,
                              struct v4l2_streamparm *parm)
@@ -1536,14 +1503,12 @@ static void sd_set_streamparm(struct gspca_dev *gspca_dev,
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name     = MODULE_NAME,
-        .ctrls    = sd_ctrls,
-        .nctrls   = ARRAY_SIZE(sd_ctrls),
         .config   = sd_config,
         .init     = sd_init,
+        .init_controls = sd_init_controls,
         .start    = sd_start,
         .stopN    = sd_stopN,
         .pkt_scan = sd_pkt_scan,
-        .querymenu = sd_querymenu,
         .get_streamparm = sd_get_streamparm,
         .set_streamparm = sd_set_streamparm,
 };
@@ -1572,6 +1537,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend    = gspca_suspend,
         .resume     = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/ov534_9.c b/drivers/media/video/gspca/ov534_9.c
index 1fd41f0d2e95..c4cd028fe0b4 100644
--- a/drivers/media/video/gspca/ov534_9.c
+++ b/drivers/media/video/gspca/ov534_9.c
@@ -47,22 +47,9 @@ MODULE_AUTHOR("Jean-Francois Moine <moinejf@free.fr>");
 MODULE_DESCRIPTION("GSPCA/OV534_9 USB Camera Driver");
 MODULE_LICENSE("GPL");
 
-/* controls */
-enum e_ctrl {
-        BRIGHTNESS,
-        CONTRAST,
-        AUTOGAIN,
-        EXPOSURE,
-        SHARPNESS,
-        SATUR,
-        LIGHTFREQ,
-        NCTRLS          /* number of controls */
-};
-
 /* specific webcam descriptor */
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
-        struct gspca_ctrl ctrls[NCTRLS];
         __u32 last_pts;
         u8 last_fid;
 
@@ -75,103 +62,6 @@ enum sensors {
         NSENSORS
 };
 
-/* V4L2 controls supported by the driver */
-static void setbrightness(struct gspca_dev *gspca_dev);
-static void setcontrast(struct gspca_dev *gspca_dev);
-static void setautogain(struct gspca_dev *gspca_dev);
-static void setexposure(struct gspca_dev *gspca_dev);
-static void setsharpness(struct gspca_dev *gspca_dev);
-static void setsatur(struct gspca_dev *gspca_dev);
-static void setlightfreq(struct gspca_dev *gspca_dev);
-
-static const struct ctrl sd_ctrls[NCTRLS] = {
-[BRIGHTNESS] = {
-        {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-                .maximum = 15,
-                .step    = 1,
-                .default_value = 7
-        },
-        .set_control = setbrightness
-    },
-[CONTRAST] = {
-        {
-                .id      = V4L2_CID_CONTRAST,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Contrast",
-                .minimum = 0,
-                .maximum = 15,
-                .step    = 1,
-                .default_value = 3
-        },
-        .set_control = setcontrast
-    },
-[AUTOGAIN] = {
-        {
-                .id      = V4L2_CID_AUTOGAIN,
-                .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                .name    = "Autogain",
-                .minimum = 0,
-                .maximum = 1,
-                .step    = 1,
-#define AUTOGAIN_DEF 1
-                .default_value = AUTOGAIN_DEF,
-        },
-        .set_control = setautogain
-    },
-[EXPOSURE] = {
-        {
-                .id      = V4L2_CID_EXPOSURE,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Exposure",
-                .minimum = 0,
-                .maximum = 3,
-                .step    = 1,
-                .default_value = 0
-        },
-        .set_control = setexposure
-    },
-[SHARPNESS] = {
-        {
-                .id      = V4L2_CID_SHARPNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Sharpness",
-                .minimum = -1,          /* -1 = auto */
-                .maximum = 4,
-                .step    = 1,
-                .default_value = -1
-        },
-        .set_control = setsharpness
-    },
-[SATUR] = {
-        {
-                .id      = V4L2_CID_SATURATION,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Saturation",
-                .minimum = 0,
-                .maximum = 4,
-                .step    = 1,
-                .default_value = 2
-        },
-        .set_control = setsatur
-    },
-[LIGHTFREQ] = {
-        {
-                .id      = V4L2_CID_POWER_LINE_FREQUENCY,
-                .type    = V4L2_CTRL_TYPE_MENU,
-                .name    = "Light frequency filter",
-                .minimum = 0,
-                .maximum = 2,   /* 0: 0, 1: 50Hz, 2:60Hz */
-                .step    = 1,
-                .default_value = 0
-        },
-        .set_control = setlightfreq
-    },
-};
-
 static const struct v4l2_pix_format ov965x_mode[] = {
 #define QVGA_MODE 0
         {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
@@ -1104,16 +994,14 @@ static void set_led(struct gspca_dev *gspca_dev, int status)
         }
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 brightness)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u8 val;
         s8 sval;
 
-        if (gspca_dev->ctrl_dis & (1 << BRIGHTNESS))
-                return;
         if (sd->sensor == SENSOR_OV562x) {
-                sval = sd->ctrls[BRIGHTNESS].val;
+                sval = brightness;
                 val = 0x76;
                 val += sval;
                 sccb_write(gspca_dev, 0x24, val);
@@ -1128,7 +1016,7 @@ static void setbrightness(struct gspca_dev *gspca_dev)
                         val = 0xe6;
                 sccb_write(gspca_dev, 0x26, val);
         } else {
-                val = sd->ctrls[BRIGHTNESS].val;
+                val = brightness;
                 if (val < 8)
                         val = 15 - val;         /* f .. 8 */
                 else
@@ -1138,43 +1026,32 @@ static void setbrightness(struct gspca_dev *gspca_dev)
         }
 }
 
-static void setcontrast(struct gspca_dev *gspca_dev)
+static void setcontrast(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        if (gspca_dev->ctrl_dis & (1 << CONTRAST))
-                return;
         sccb_write(gspca_dev, 0x56,     /* cnst1 - contrast 1 ctrl coeff */
-                        sd->ctrls[CONTRAST].val << 4);
+                        val << 4);
 }
 
-static void setautogain(struct gspca_dev *gspca_dev)
+static void setautogain(struct gspca_dev *gspca_dev, s32 autogain)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u8 val;
 
-        if (gspca_dev->ctrl_dis & (1 << AUTOGAIN))
-                return;
 /*fixme: should adjust agc/awb/aec by different controls */
         val = sccb_read(gspca_dev, 0x13);               /* com8 */
         sccb_write(gspca_dev, 0xff, 0x00);
-        if (sd->ctrls[AUTOGAIN].val)
+        if (autogain)
                 val |= 0x05;            /* agc & aec */
         else
                 val &= 0xfa;
         sccb_write(gspca_dev, 0x13, val);
 }
 
-static void setexposure(struct gspca_dev *gspca_dev)
+static void setexposure(struct gspca_dev *gspca_dev, s32 exposure)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        u8 val;
         static const u8 expo[4] = {0x00, 0x25, 0x38, 0x5e};
+        u8 val;
 
-        if (gspca_dev->ctrl_dis & (1 << EXPOSURE))
-                return;
-        sccb_write(gspca_dev, 0x10,                     /* aec[9:2] */
-                        expo[sd->ctrls[EXPOSURE].val]);
+        sccb_write(gspca_dev, 0x10, expo[exposure]);    /* aec[9:2] */
 
         val = sccb_read(gspca_dev, 0x13);               /* com8 */
         sccb_write(gspca_dev, 0xff, 0x00);
@@ -1185,14 +1062,8 @@ static void setexposure(struct gspca_dev *gspca_dev)
         sccb_write(gspca_dev, 0xa1, val & 0xe0);        /* aec[15:10] = 0 */
 }
 
-static void setsharpness(struct gspca_dev *gspca_dev)
+static void setsharpness(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        s8 val;
-
-        if (gspca_dev->ctrl_dis & (1 << SHARPNESS))
-                return;
-        val = sd->ctrls[SHARPNESS].val;
         if (val < 0) {                          /* auto */
                 val = sccb_read(gspca_dev, 0x42);       /* com17 */
                 sccb_write(gspca_dev, 0xff, 0x00);
@@ -1209,9 +1080,8 @@ static void setsharpness(struct gspca_dev *gspca_dev)
         sccb_write(gspca_dev, 0x42, val & 0xbf);
 }
 
-static void setsatur(struct gspca_dev *gspca_dev)
+static void setsatur(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u8 val1, val2, val3;
         static const u8 matrix[5][2] = {
                 {0x14, 0x38},
@@ -1221,10 +1091,8 @@ static void setsatur(struct gspca_dev *gspca_dev)
                 {0x48, 0x90}
         };
 
-        if (gspca_dev->ctrl_dis & (1 << SATUR))
-                return;
-        val1 = matrix[sd->ctrls[SATUR].val][0];
-        val2 = matrix[sd->ctrls[SATUR].val][1];
+        val1 = matrix[val][0];
+        val2 = matrix[val][1];
         val3 = val1 + val2;
         sccb_write(gspca_dev, 0x4f, val3);      /* matrix coeff */
         sccb_write(gspca_dev, 0x50, val3);
@@ -1239,16 +1107,13 @@ static void setsatur(struct gspca_dev *gspca_dev)
         sccb_write(gspca_dev, 0x41, val1);
 }
 
-static void setlightfreq(struct gspca_dev *gspca_dev)
+static void setlightfreq(struct gspca_dev *gspca_dev, s32 freq)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u8 val;
 
-        if (gspca_dev->ctrl_dis & (1 << LIGHTFREQ))
-                return;
         val = sccb_read(gspca_dev, 0x13);               /* com8 */
         sccb_write(gspca_dev, 0xff, 0x00);
-        if (sd->ctrls[LIGHTFREQ].val == 0) {
+        if (freq == 0) {
                 sccb_write(gspca_dev, 0x13, val & 0xdf);
                 return;
         }
@@ -1256,7 +1121,7 @@ static void setlightfreq(struct gspca_dev *gspca_dev)
 
         val = sccb_read(gspca_dev, 0x42);               /* com17 */
         sccb_write(gspca_dev, 0xff, 0x00);
-        if (sd->ctrls[LIGHTFREQ].val == 1)
+        if (freq == 1)
                 val |= 0x01;
         else
                 val &= 0xfe;
@@ -1267,13 +1132,6 @@ static void setlightfreq(struct gspca_dev *gspca_dev)
 static int sd_config(struct gspca_dev *gspca_dev,
                      const struct usb_device_id *id)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        gspca_dev->cam.ctrls = sd->ctrls;
-
-#if AUTOGAIN_DEF != 0
-        gspca_dev->ctrl_inac |= (1 << EXPOSURE);
-#endif
         return 0;
 }
 
@@ -1330,9 +1188,6 @@ static int sd_init(struct gspca_dev *gspca_dev)
                 gspca_dev->cam.cam_mode = ov971x_mode;
                 gspca_dev->cam.nmodes = ARRAY_SIZE(ov971x_mode);
 
-                /* no control yet */
-                gspca_dev->ctrl_dis = (1 << NCTRLS) - 1;
-
                 gspca_dev->cam.bulk = 1;
                 gspca_dev->cam.bulk_size = 16384;
                 gspca_dev->cam.bulk_nurbs = 2;
@@ -1358,16 +1213,6 @@ static int sd_init(struct gspca_dev *gspca_dev)
                         reg_w(gspca_dev, 0x56, 0x17);
         } else if ((sensor_id & 0xfff0) == 0x5620) {
                 sd->sensor = SENSOR_OV562x;
-                gspca_dev->ctrl_dis = (1 << CONTRAST) |
-                                        (1 << AUTOGAIN) |
-                                        (1 << EXPOSURE) |
-                                        (1 << SHARPNESS) |
-                                        (1 << SATUR) |
-                                        (1 << LIGHTFREQ);
-
-                sd->ctrls[BRIGHTNESS].min = -90;
-                sd->ctrls[BRIGHTNESS].max = 90;
-                sd->ctrls[BRIGHTNESS].def = 0;
                 gspca_dev->cam.cam_mode = ov562x_mode;
                 gspca_dev->cam.nmodes = ARRAY_SIZE(ov562x_mode);
 
@@ -1390,10 +1235,9 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
         if (sd->sensor == SENSOR_OV971x)
                 return gspca_dev->usb_err;
-        else if (sd->sensor == SENSOR_OV562x) {
-                setbrightness(gspca_dev);
+        if (sd->sensor == SENSOR_OV562x)
                 return gspca_dev->usb_err;
-        }
+
         switch (gspca_dev->curr_mode) {
         case QVGA_MODE:                 /* 320x240 */
                 sccb_w_array(gspca_dev, ov965x_start_1_vga,
@@ -1437,13 +1281,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
                                 ARRAY_SIZE(ov965x_start_2_sxga));
                 break;
         }
-        setlightfreq(gspca_dev);
-        setautogain(gspca_dev);
-        setbrightness(gspca_dev);
-        setcontrast(gspca_dev);
-        setexposure(gspca_dev);
-        setsharpness(gspca_dev);
-        setsatur(gspca_dev);
 
         reg_w(gspca_dev, 0xe0, 0x00);
         reg_w(gspca_dev, 0xe0, 0x00);
@@ -1541,38 +1378,94 @@ scan_next:
         } while (remaining_len > 0);
 }
 
-static int sd_querymenu(struct gspca_dev *gspca_dev,
-                        struct v4l2_querymenu *menu)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        switch (menu->id) {
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+
+        gspca_dev->usb_err = 0;
+
+        if (!gspca_dev->streaming)
+                return 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                setcontrast(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_SATURATION:
+                setsatur(gspca_dev, ctrl->val);
+                break;
         case V4L2_CID_POWER_LINE_FREQUENCY:
-                switch (menu->index) {
-                case 0:         /* V4L2_CID_POWER_LINE_FREQUENCY_DISABLED */
-                        strcpy((char *) menu->name, "NoFliker");
-                        return 0;
-                case 1:         /* V4L2_CID_POWER_LINE_FREQUENCY_50HZ */
-                        strcpy((char *) menu->name, "50 Hz");
-                        return 0;
-                case 2:         /* V4L2_CID_POWER_LINE_FREQUENCY_60HZ */
-                        strcpy((char *) menu->name, "60 Hz");
-                        return 0;
-                }
+                setlightfreq(gspca_dev, ctrl->val);
                 break;
+        case V4L2_CID_SHARPNESS:
+                setsharpness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_AUTOGAIN:
+                if (ctrl->is_new)
+                        setautogain(gspca_dev, ctrl->val);
+                if (!ctrl->val && gspca_dev->exposure->is_new)
+                        setexposure(gspca_dev, gspca_dev->exposure->val);
+                break;
+        }
+        return gspca_dev->usb_err;
+}
+
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
+
+static int sd_init_controls(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *)gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        if (sd->sensor == SENSOR_OV971x)
+                return 0;
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 7);
+        if (sd->sensor == SENSOR_OV562x) {
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, -90, 90, 1, 0);
+        } else {
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 15, 1, 7);
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, 15, 1, 3);
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SATURATION, 0, 4, 1, 2);
+                /* -1 = auto */
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SHARPNESS, -1, 4, 1, -1);
+                gspca_dev->autogain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+                gspca_dev->exposure = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_EXPOSURE, 0, 3, 1, 0);
+                v4l2_ctrl_new_std_menu(hdl, &sd_ctrl_ops,
+                        V4L2_CID_POWER_LINE_FREQUENCY,
+                        V4L2_CID_POWER_LINE_FREQUENCY_60HZ, 0, 0);
+                v4l2_ctrl_auto_cluster(3, &gspca_dev->autogain, 0, false);
         }
-        return -EINVAL;
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+        return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name     = MODULE_NAME,
-        .ctrls    = sd_ctrls,
-        .nctrls   = NCTRLS,
         .config   = sd_config,
         .init     = sd_init,
+        .init_controls = sd_init_controls,
         .start    = sd_start,
         .stopN    = sd_stopN,
         .pkt_scan = sd_pkt_scan,
-        .querymenu = sd_querymenu,
 };
 
 /* -- module initialisation -- */
@@ -1600,6 +1493,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend    = gspca_suspend,
         .resume     = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c
index fa661c6d6d55..d236d1791f78 100644
--- a/drivers/media/video/gspca/pac207.c
+++ b/drivers/media/video/gspca/pac207.c
@@ -462,6 +462,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/pac7302.c b/drivers/media/video/gspca/pac7302.c
index a0369a58c4bb..4877f7ab3d59 100644
--- a/drivers/media/video/gspca/pac7302.c
+++ b/drivers/media/video/gspca/pac7302.c
@@ -84,31 +84,31 @@
 /* Include pac common sof detection functions */
 #include "pac_common.h"
 
+#define PAC7302_GAIN_DEFAULT      15
+#define PAC7302_GAIN_KNEE         42
+#define PAC7302_EXPOSURE_DEFAULT  66 /* 33 ms / 30 fps */
+#define PAC7302_EXPOSURE_KNEE    133 /* 66 ms / 15 fps */
+
 MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>, "
                 "Thomas Kaiser thomas@kaiser-linux.li");
 MODULE_DESCRIPTION("Pixart PAC7302");
 MODULE_LICENSE("GPL");
 
-enum e_ctrl {
-        BRIGHTNESS,
-        CONTRAST,
-        COLORS,
-        WHITE_BALANCE,
-        RED_BALANCE,
-        BLUE_BALANCE,
-        GAIN,
-        AUTOGAIN,
-        EXPOSURE,
-        VFLIP,
-        HFLIP,
-        NCTRLS          /* number of controls */
-};
-
 struct sd {
         struct gspca_dev gspca_dev;             /* !! must be the first item */
 
-        struct gspca_ctrl ctrls[NCTRLS];
-
+        struct { /* brightness / contrast cluster */
+                struct v4l2_ctrl *brightness;
+                struct v4l2_ctrl *contrast;
+        };
+        struct v4l2_ctrl *saturation;
+        struct v4l2_ctrl *white_balance;
+        struct v4l2_ctrl *red_balance;
+        struct v4l2_ctrl *blue_balance;
+        struct { /* flip cluster */
+                struct v4l2_ctrl *hflip;
+                struct v4l2_ctrl *vflip;
+        };
         u8 flags;
 #define FL_HFLIP 0x01           /* mirrored by default */
 #define FL_VFLIP 0x02           /* vertical flipped by default */
@@ -119,160 +119,6 @@ struct sd {
         atomic_t avg_lum;
 };
 
-/* V4L2 controls supported by the driver */
-static void setbrightcont(struct gspca_dev *gspca_dev);
-static void setcolors(struct gspca_dev *gspca_dev);
-static void setwhitebalance(struct gspca_dev *gspca_dev);
-static void setredbalance(struct gspca_dev *gspca_dev);
-static void setbluebalance(struct gspca_dev *gspca_dev);
-static void setgain(struct gspca_dev *gspca_dev);
-static void setexposure(struct gspca_dev *gspca_dev);
-static void setautogain(struct gspca_dev *gspca_dev);
-static void sethvflip(struct gspca_dev *gspca_dev);
-
-static const struct ctrl sd_ctrls[] = {
-[BRIGHTNESS] = {
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-#define BRIGHTNESS_MAX 0x20
-                .maximum = BRIGHTNESS_MAX,
-                .step    = 1,
-                .default_value = 0x10,
-            },
-            .set_control = setbrightcont
-        },
-[CONTRAST] = {
-            {
-                .id      = V4L2_CID_CONTRAST,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Contrast",
-                .minimum = 0,
-#define CONTRAST_MAX 255
-                .maximum = CONTRAST_MAX,
-                .step    = 1,
-                .default_value = 127,
-            },
-            .set_control = setbrightcont
-        },
-[COLORS] = {
-            {
-                .id      = V4L2_CID_SATURATION,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Saturation",
-                .minimum = 0,
-#define COLOR_MAX 255
-                .maximum = COLOR_MAX,
-                .step    = 1,
-                .default_value = 127
-            },
-            .set_control = setcolors
-        },
-[WHITE_BALANCE] = {
-            {
-                .id      = V4L2_CID_WHITE_BALANCE_TEMPERATURE,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "White Balance",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-                .default_value = 4,
-            },
-            .set_control = setwhitebalance
-        },
-[RED_BALANCE] = {
-            {
-                .id      = V4L2_CID_RED_BALANCE,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Red",
-                .minimum = 0,
-                .maximum = 3,
-                .step    = 1,
-                .default_value = 1,
-            },
-            .set_control = setredbalance
-        },
-[BLUE_BALANCE] = {
-            {
-                .id      = V4L2_CID_BLUE_BALANCE,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Blue",
-                .minimum = 0,
-                .maximum = 3,
-                .step    = 1,
-                .default_value = 1,
-            },
-            .set_control = setbluebalance
-        },
-[GAIN] = {
-            {
-                .id      = V4L2_CID_GAIN,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Gain",
-                .minimum = 0,
-                .maximum = 62,
-                .step    = 1,
-#define GAIN_DEF 15
-#define GAIN_KNEE 46
-                .default_value = GAIN_DEF,
-            },
-            .set_control = setgain
-        },
-[EXPOSURE] = {
-            {
-                .id      = V4L2_CID_EXPOSURE,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Exposure",
-                .minimum = 0,
-                .maximum = 1023,
-                .step    = 1,
-#define EXPOSURE_DEF  66  /*  33 ms / 30 fps */
-#define EXPOSURE_KNEE 133 /*  66 ms / 15 fps */
-                .default_value = EXPOSURE_DEF,
-            },
-            .set_control = setexposure
-        },
-[AUTOGAIN] = {
-            {
-                .id      = V4L2_CID_AUTOGAIN,
-                .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                .name    = "Auto Gain",
-                .minimum = 0,
-                .maximum = 1,
-                .step    = 1,
-#define AUTOGAIN_DEF 1
-                .default_value = AUTOGAIN_DEF,
-            },
-            .set_control = setautogain,
-        },
-[HFLIP] = {
-            {
-                .id      = V4L2_CID_HFLIP,
-                .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                .name    = "Mirror",
-                .minimum = 0,
-                .maximum = 1,
-                .step    = 1,
-                .default_value = 0,
-            },
-            .set_control = sethvflip,
-        },
-[VFLIP] = {
-            {
-                .id      = V4L2_CID_VFLIP,
-                .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                .name    = "Vflip",
-                .minimum = 0,
-                .maximum = 1,
-                .step    = 1,
-                .default_value = 0,
-            },
-            .set_control = sethvflip
-        },
-};
-
 static const struct v4l2_pix_format vga_mode[] = {
         {640, 480, V4L2_PIX_FMT_PJPG, V4L2_FIELD_NONE,
                 .bytesperline = 640,
@@ -516,8 +362,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         cam->cam_mode = vga_mode;       /* only 640x480 */
         cam->nmodes = ARRAY_SIZE(vga_mode);
 
-        gspca_dev->cam.ctrls = sd->ctrls;
-
         sd->flags = id->driver_info;
         return 0;
 }
@@ -536,9 +380,9 @@ static void setbrightcont(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, 0xff, 0x00);           /* page 0 */
         for (i = 0; i < 10; i++) {
                 v = max[i];
-                v += (sd->ctrls[BRIGHTNESS].val - BRIGHTNESS_MAX)
-                        * 150 / BRIGHTNESS_MAX;         /* 200 ? */
-                v -= delta[i] * sd->ctrls[CONTRAST].val / CONTRAST_MAX;
+                v += (sd->brightness->val - sd->brightness->maximum)
+                        * 150 / sd->brightness->maximum; /* 200 ? */
+                v -= delta[i] * sd->contrast->val / sd->contrast->maximum;
                 if (v < 0)
                         v = 0;
                 else if (v > 0xff)
@@ -561,7 +405,8 @@ static void setcolors(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, 0x11, 0x01);
         reg_w(gspca_dev, 0xff, 0x00);                   /* page 0 */
         for (i = 0; i < 9; i++) {
-                v = a[i] * sd->ctrls[COLORS].val / COLOR_MAX + b[i];
+                v = a[i] * sd->saturation->val / sd->saturation->maximum;
+                v += b[i];
                 reg_w(gspca_dev, 0x0f + 2 * i, (v >> 8) & 0x07);
                 reg_w(gspca_dev, 0x0f + 2 * i + 1, v);
         }
@@ -573,7 +418,7 @@ static void setwhitebalance(struct gspca_dev *gspca_dev)
         struct sd *sd = (struct sd *) gspca_dev;
 
         reg_w(gspca_dev, 0xff, 0x00);           /* page 0 */
-        reg_w(gspca_dev, 0xc6, sd->ctrls[WHITE_BALANCE].val);
+        reg_w(gspca_dev, 0xc6, sd->white_balance->val);
 
         reg_w(gspca_dev, 0xdc, 0x01);
 }
@@ -583,7 +428,7 @@ static void setredbalance(struct gspca_dev *gspca_dev)
         struct sd *sd = (struct sd *) gspca_dev;
 
         reg_w(gspca_dev, 0xff, 0x00);           /* page 0 */
-        reg_w(gspca_dev, 0xc5, sd->ctrls[RED_BALANCE].val);
+        reg_w(gspca_dev, 0xc5, sd->red_balance->val);
 
         reg_w(gspca_dev, 0xdc, 0x01);
 }
@@ -593,22 +438,21 @@ static void setbluebalance(struct gspca_dev *gspca_dev)
         struct sd *sd = (struct sd *) gspca_dev;
 
         reg_w(gspca_dev, 0xff, 0x00);                   /* page 0 */
-        reg_w(gspca_dev, 0xc7, sd->ctrls[BLUE_BALANCE].val);
+        reg_w(gspca_dev, 0xc7, sd->blue_balance->val);
 
         reg_w(gspca_dev, 0xdc, 0x01);
 }
 
 static void setgain(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u8 reg10, reg12;
 
-        if (sd->ctrls[GAIN].val < 32) {
-                reg10 = sd->ctrls[GAIN].val;
+        if (gspca_dev->gain->val < 32) {
+                reg10 = gspca_dev->gain->val;
                 reg12 = 0;
         } else {
                 reg10 = 31;
-                reg12 = sd->ctrls[GAIN].val - 31;
+                reg12 = gspca_dev->gain->val - 31;
         }
 
         reg_w(gspca_dev, 0xff, 0x03);                   /* page 3 */
@@ -621,7 +465,6 @@ static void setgain(struct gspca_dev *gspca_dev)
 
 static void setexposure(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u8 clockdiv;
         u16 exposure;
 
@@ -630,7 +473,7 @@ static void setexposure(struct gspca_dev *gspca_dev)
          * no fps according to the formula: 90 / reg. sd->exposure is the
          * desired exposure time in 0.5 ms.
          */
-        clockdiv = (90 * sd->ctrls[EXPOSURE].val + 1999) / 2000;
+        clockdiv = (90 * gspca_dev->exposure->val + 1999) / 2000;
 
         /*
          * Note clockdiv = 3 also works, but when running at 30 fps, depending
@@ -655,7 +498,7 @@ static void setexposure(struct gspca_dev *gspca_dev)
          * frame exposure time in ms = 1000 * clockdiv / 90    ->
          * exposure = (sd->exposure / 2) * 448 / (1000 * clockdiv / 90)
          */
-        exposure = (sd->ctrls[EXPOSURE].val * 45 * 448) / (1000 * clockdiv);
+        exposure = (gspca_dev->exposure->val * 45 * 448) / (1000 * clockdiv);
         /* 0 = use full frametime, 448 = no exposure, reverse it */
         exposure = 448 - exposure;
 
@@ -668,37 +511,15 @@ static void setexposure(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, 0x11, 0x01);
 }
 
-static void setautogain(struct gspca_dev *gspca_dev)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        /*
-         * When switching to autogain set defaults to make sure
-         * we are on a valid point of the autogain gain /
-         * exposure knee graph, and give this change time to
-         * take effect before doing autogain.
-         */
-        if (sd->ctrls[AUTOGAIN].val) {
-                sd->ctrls[EXPOSURE].val = EXPOSURE_DEF;
-                sd->ctrls[GAIN].val = GAIN_DEF;
-                sd->autogain_ignore_frames =
-                                PAC_AUTOGAIN_IGNORE_FRAMES;
-        } else {
-                sd->autogain_ignore_frames = -1;
-        }
-        setexposure(gspca_dev);
-        setgain(gspca_dev);
-}
-
 static void sethvflip(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u8 data, hflip, vflip;
 
-        hflip = sd->ctrls[HFLIP].val;
+        hflip = sd->hflip->val;
         if (sd->flags & FL_HFLIP)
                 hflip = !hflip;
-        vflip = sd->ctrls[VFLIP].val;
+        vflip = sd->vflip->val;
         if (sd->flags & FL_VFLIP)
                 vflip = !vflip;
 
@@ -717,6 +538,112 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return gspca_dev->usb_err;
 }
 
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
+
+        gspca_dev->usb_err = 0;
+
+        if (ctrl->id == V4L2_CID_AUTOGAIN && ctrl->is_new && ctrl->val) {
+                /* when switching to autogain set defaults to make sure
+                   we are on a valid point of the autogain gain /
+                   exposure knee graph, and give this change time to
+                   take effect before doing autogain. */
+                gspca_dev->exposure->val    = PAC7302_EXPOSURE_DEFAULT;
+                gspca_dev->gain->val        = PAC7302_GAIN_DEFAULT;
+                sd->autogain_ignore_frames  = PAC_AUTOGAIN_IGNORE_FRAMES;
+        }
+
+        if (!gspca_dev->streaming)
+                return 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightcont(gspca_dev);
+                break;
+        case V4L2_CID_SATURATION:
+                setcolors(gspca_dev);
+                break;
+        case V4L2_CID_WHITE_BALANCE_TEMPERATURE:
+                setwhitebalance(gspca_dev);
+                break;
+        case V4L2_CID_RED_BALANCE:
+                setredbalance(gspca_dev);
+                break;
+        case V4L2_CID_BLUE_BALANCE:
+                setbluebalance(gspca_dev);
+                break;
+        case V4L2_CID_AUTOGAIN:
+                if (gspca_dev->exposure->is_new || (ctrl->is_new && ctrl->val))
+                        setexposure(gspca_dev);
+                if (gspca_dev->gain->is_new || (ctrl->is_new && ctrl->val))
+                        setgain(gspca_dev);
+                break;
+        case V4L2_CID_HFLIP:
+                sethvflip(gspca_dev);
+                break;
+        default:
+                return -EINVAL;
+        }
+        return gspca_dev->usb_err;
+}
+
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
+
+/* this function is called at probe time */
+static int sd_init_controls(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 11);
+
+        sd->brightness = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_BRIGHTNESS, 0, 32, 1, 16);
+        sd->contrast = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_CONTRAST, 0, 255, 1, 127);
+
+        sd->saturation = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_SATURATION, 0, 255, 1, 127);
+        sd->white_balance = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_WHITE_BALANCE_TEMPERATURE,
+                                        0, 255, 1, 4);
+        sd->red_balance = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_RED_BALANCE, 0, 3, 1, 1);
+        sd->blue_balance = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_RED_BALANCE, 0, 3, 1, 1);
+
+        gspca_dev->autogain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+        gspca_dev->exposure = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_EXPOSURE, 0, 1023, 1,
+                                        PAC7302_EXPOSURE_DEFAULT);
+        gspca_dev->gain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_GAIN, 0, 62, 1,
+                                        PAC7302_GAIN_DEFAULT);
+
+        sd->hflip = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                V4L2_CID_HFLIP, 0, 1, 1, 0);
+        sd->vflip = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                V4L2_CID_VFLIP, 0, 1, 1, 0);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+
+        v4l2_ctrl_cluster(2, &sd->brightness);
+        v4l2_ctrl_auto_cluster(3, &gspca_dev->autogain, 0, false);
+        v4l2_ctrl_cluster(2, &sd->hflip);
+        return 0;
+}
+
+/* -- start the camera -- */
 static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
@@ -728,11 +655,13 @@ static int sd_start(struct gspca_dev *gspca_dev)
         setwhitebalance(gspca_dev);
         setredbalance(gspca_dev);
         setbluebalance(gspca_dev);
-        setautogain(gspca_dev);
+        setexposure(gspca_dev);
+        setgain(gspca_dev);
         sethvflip(gspca_dev);
 
         sd->sof_read = 0;
-        atomic_set(&sd->avg_lum, 270 + sd->ctrls[BRIGHTNESS].val);
+        sd->autogain_ignore_frames = 0;
+        atomic_set(&sd->avg_lum, 270 + sd->brightness->val);
 
         /* start stream */
         reg_w(gspca_dev, 0xff, 0x01);
@@ -758,9 +687,6 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, 0x78, 0x40);
 }
 
-#define WANT_REGULAR_AUTOGAIN
-#include "autogain_functions.h"
-
 static void do_autogain(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
@@ -774,11 +700,13 @@ static void do_autogain(struct gspca_dev *gspca_dev)
         if (sd->autogain_ignore_frames > 0) {
                 sd->autogain_ignore_frames--;
         } else {
-                desired_lum = 270 + sd->ctrls[BRIGHTNESS].val;
+                desired_lum = 270 + sd->brightness->val;
 
-                auto_gain_n_exposure(gspca_dev, avg_lum, desired_lum,
-                                deadzone, GAIN_KNEE, EXPOSURE_KNEE);
-                sd->autogain_ignore_frames = PAC_AUTOGAIN_IGNORE_FRAMES;
+                if (gspca_expo_autogain(gspca_dev, avg_lum, desired_lum,
+                                        deadzone, PAC7302_GAIN_KNEE,
+                                        PAC7302_EXPOSURE_KNEE))
+                        sd->autogain_ignore_frames =
+                                                PAC_AUTOGAIN_IGNORE_FRAMES;
         }
 }
 
@@ -944,10 +872,9 @@ static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
 /* sub-driver description for pac7302 */
 static const struct sd_desc sd_desc = {
         .name = KBUILD_MODNAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
         .stop0 = sd_stop0,
@@ -998,6 +925,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index 115da169f32a..ba3558d3f017 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -694,6 +694,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/se401.c b/drivers/media/video/gspca/se401.c
index bb70092c2229..a33cb78a839c 100644
--- a/drivers/media/video/gspca/se401.c
+++ b/drivers/media/video/gspca/se401.c
@@ -45,15 +45,6 @@ MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
 MODULE_DESCRIPTION("Endpoints se401");
 MODULE_LICENSE("GPL");
 
-/* controls */
-enum e_ctrl {
-        BRIGHTNESS,
-        GAIN,
-        EXPOSURE,
-        FREQ,
-        NCTRL   /* number of controls */
-};
-
 /* exposure change state machine states */
 enum {
         EXPO_CHANGED,
@@ -64,7 +55,11 @@ enum {
 /* specific webcam descriptor */
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
-        struct gspca_ctrl ctrls[NCTRL];
+        struct { /* exposure/freq control cluster */
+                struct v4l2_ctrl *exposure;
+                struct v4l2_ctrl *freq;
+        };
+        bool has_brightness;
         struct v4l2_pix_format fmts[MAX_MODES];
         int pixels_read;
         int packet_read;
@@ -77,60 +72,6 @@ struct sd {
         int expo_change_state;
 };
 
-static void setbrightness(struct gspca_dev *gspca_dev);
-static void setgain(struct gspca_dev *gspca_dev);
-static void setexposure(struct gspca_dev *gspca_dev);
-
-static const struct ctrl sd_ctrls[NCTRL] = {
-[BRIGHTNESS] = {
-                {
-                        .id      = V4L2_CID_BRIGHTNESS,
-                        .type    = V4L2_CTRL_TYPE_INTEGER,
-                        .name    = "Brightness",
-                        .minimum = 0,
-                        .maximum = 255,
-                        .step    = 1,
-                        .default_value = 15,
-                },
-                .set_control = setbrightness
-        },
-[GAIN] = {
-                {
-                        .id      = V4L2_CID_GAIN,
-                        .type    = V4L2_CTRL_TYPE_INTEGER,
-                        .name    = "Gain",
-                        .minimum = 0,
-                        .maximum = 50, /* Really 63 but > 50 is not pretty */
-                        .step    = 1,
-                        .default_value = 25,
-                },
-                .set_control = setgain
-        },
-[EXPOSURE] = {
-                {
-                        .id = V4L2_CID_EXPOSURE,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "Exposure",
-                        .minimum = 0,
-                        .maximum = 32767,
-                        .step = 1,
-                        .default_value = 15000,
-                },
-                .set_control = setexposure
-        },
-[FREQ] = {
-                {
-                        .id      = V4L2_CID_POWER_LINE_FREQUENCY,
-                        .type    = V4L2_CTRL_TYPE_MENU,
-                        .name    = "Light frequency filter",
-                        .minimum = 0,
-                        .maximum = 2,
-                        .step    = 1,
-                        .default_value = 0,
-                },
-                .set_control = setexposure
-        },
-};
 
 static void se401_write_req(struct gspca_dev *gspca_dev, u16 req, u16 value,
                             int silent)
@@ -224,22 +165,15 @@ static int se401_get_feature(struct gspca_dev *gspca_dev, u16 selector)
         return gspca_dev->usb_buf[0] | (gspca_dev->usb_buf[1] << 8);
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        if (gspca_dev->ctrl_dis & (1 << BRIGHTNESS))
-                return;
-
         /* HDG: this does not seem to do anything on my cam */
-        se401_write_req(gspca_dev, SE401_REQ_SET_BRT,
-                        sd->ctrls[BRIGHTNESS].val, 0);
+        se401_write_req(gspca_dev, SE401_REQ_SET_BRT, val, 0);
 }
 
-static void setgain(struct gspca_dev *gspca_dev)
+static void setgain(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        u16 gain = 63 - sd->ctrls[GAIN].val;
+        u16 gain = 63 - val;
 
         /* red color gain */
         se401_set_feature(gspca_dev, HV7131_REG_ARCG, gain);
@@ -249,10 +183,10 @@ static void setgain(struct gspca_dev *gspca_dev)
         se401_set_feature(gspca_dev, HV7131_REG_ABCG, gain);
 }
 
-static void setexposure(struct gspca_dev *gspca_dev)
+static void setexposure(struct gspca_dev *gspca_dev, s32 val, s32 freq)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        int integration = sd->ctrls[EXPOSURE].val << 6;
+        int integration = val << 6;
         u8 expose_h, expose_m, expose_l;
 
         /* Do this before the set_feature calls, for proper timing wrt
@@ -262,9 +196,9 @@ static void setexposure(struct gspca_dev *gspca_dev)
            through so be it */
         sd->expo_change_state = EXPO_CHANGED;
 
-        if (sd->ctrls[FREQ].val == V4L2_CID_POWER_LINE_FREQUENCY_50HZ)
+        if (freq == V4L2_CID_POWER_LINE_FREQUENCY_50HZ)
                 integration = integration - integration % 106667;
-        if (sd->ctrls[FREQ].val == V4L2_CID_POWER_LINE_FREQUENCY_60HZ)
+        if (freq == V4L2_CID_POWER_LINE_FREQUENCY_60HZ)
                 integration = integration - integration % 88889;
 
         expose_h = (integration >> 16);
@@ -375,15 +309,12 @@ static int sd_config(struct gspca_dev *gspca_dev,
         cam->bulk = 1;
         cam->bulk_size = BULK_SIZE;
         cam->bulk_nurbs = 4;
-        cam->ctrls = sd->ctrls;
         sd->resetlevel = 0x2d; /* Set initial resetlevel */
 
         /* See if the camera supports brightness */
         se401_read_req(gspca_dev, SE401_REQ_GET_BRT, 1);
-        if (gspca_dev->usb_err) {
-                gspca_dev->ctrl_dis = (1 << BRIGHTNESS);
-                gspca_dev->usb_err = 0;
-        }
+        sd->has_brightness = !!gspca_dev->usb_err;
+        gspca_dev->usb_err = 0;
 
         return 0;
 }
@@ -442,9 +373,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
         }
         se401_set_feature(gspca_dev, SE401_OPERATINGMODE, mode);
 
-        setbrightness(gspca_dev);
-        setgain(gspca_dev);
-        setexposure(gspca_dev);
         se401_set_feature(gspca_dev, HV7131_REG_ARLV, sd->resetlevel);
 
         sd->packet_read = 0;
@@ -666,27 +594,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, u8 *data, int len)
                 sd_pkt_scan_janggu(gspca_dev, data, len);
 }
 
-static int sd_querymenu(struct gspca_dev *gspca_dev,
-                        struct v4l2_querymenu *menu)
-{
-        switch (menu->id) {
-        case V4L2_CID_POWER_LINE_FREQUENCY:
-                switch (menu->index) {
-                case V4L2_CID_POWER_LINE_FREQUENCY_DISABLED:
-                        strcpy((char *) menu->name, "NoFliker");
-                        return 0;
-                case V4L2_CID_POWER_LINE_FREQUENCY_50HZ:
-                        strcpy((char *) menu->name, "50 Hz");
-                        return 0;
-                case V4L2_CID_POWER_LINE_FREQUENCY_60HZ:
-                        strcpy((char *) menu->name, "60 Hz");
-                        return 0;
-                }
-                break;
-        }
-        return -EINVAL;
-}
-
 #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
 static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, u8 *data, int len)
 {
@@ -714,19 +621,73 @@ static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, u8 *data, int len)
 }
 #endif
 
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
+
+        gspca_dev->usb_err = 0;
+
+        if (!gspca_dev->streaming)
+                return 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_GAIN:
+                setgain(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_EXPOSURE:
+                setexposure(gspca_dev, ctrl->val, sd->freq->val);
+                break;
+        }
+        return gspca_dev->usb_err;
+}
+
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
+
+static int sd_init_controls(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *)gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 4);
+        if (sd->has_brightness)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 255, 1, 15);
+        /* max is really 63 but > 50 is not pretty */
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_GAIN, 0, 50, 1, 25);
+        sd->exposure = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_EXPOSURE, 0, 32767, 1, 15000);
+        sd->freq = v4l2_ctrl_new_std_menu(hdl, &sd_ctrl_ops,
+                        V4L2_CID_POWER_LINE_FREQUENCY,
+                        V4L2_CID_POWER_LINE_FREQUENCY_60HZ, 0, 0);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+        v4l2_ctrl_cluster(2, &sd->exposure);
+        return 0;
+}
+
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .isoc_init = sd_isoc_init,
         .start = sd_start,
         .stopN = sd_stopN,
         .dq_callback = sd_dq_callback,
         .pkt_scan = sd_pkt_scan,
-        .querymenu = sd_querymenu,
 #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
         .int_pkt_scan = sd_int_pkt_scan,
 #endif
@@ -769,6 +730,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
         .pre_reset = sd_pre_reset,
         .post_reset = sd_post_reset,
diff --git a/drivers/media/video/gspca/sn9c2028.c b/drivers/media/video/gspca/sn9c2028.c
index 478533cb1152..03fa3fd940b4 100644
--- a/drivers/media/video/gspca/sn9c2028.c
+++ b/drivers/media/video/gspca/sn9c2028.c
@@ -40,10 +40,6 @@ struct init_command {
         unsigned char to_read; /* length to read. 0 means no reply requested */
 };
 
-/* V4L2 controls supported by the driver */
-static const struct ctrl sd_ctrls[] = {
-};
-
 /* How to change the resolution of any of the VGA cams is unknown */
 static const struct v4l2_pix_format vga_mode[] = {
         {640, 480, V4L2_PIX_FMT_SN9C2028, V4L2_FIELD_NONE,
@@ -695,8 +691,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
         .start = sd_start,
@@ -734,6 +728,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index e2bdf8f632f4..fd1f8d2d3b0b 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -56,26 +56,16 @@ MODULE_AUTHOR("Jean-François Moine <http://moinejf.free.fr>");
 MODULE_DESCRIPTION("GSPCA/SN9C102 USB Camera Driver");
 MODULE_LICENSE("GPL");
 
-/* controls */
-enum e_ctrl {
-        BRIGHTNESS,
-        GAIN,
-        EXPOSURE,
-        AUTOGAIN,
-        FREQ,
-        NCTRLS          /* number of controls */
-};
-
 /* specific webcam descriptor */
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
 
-        struct gspca_ctrl ctrls[NCTRLS];
+        struct v4l2_ctrl *brightness;
+        struct v4l2_ctrl *plfreq;
 
         atomic_t avg_lum;
         int prev_avg_lum;
-        int exp_too_low_cnt;
-        int exp_too_high_cnt;
+        int exposure_knee;
         int header_read;
         u8 header[12]; /* Header without sof marker */
 
@@ -107,24 +97,16 @@ struct sensor_data {
         sensor_init_t *sensor_init;
         int sensor_init_size;
         int flags;
-        unsigned ctrl_dis;
         __u8 sensor_addr;
 };
 
 /* sensor_data flags */
-#define F_GAIN 0x01             /* has gain */
-#define F_SIF  0x02             /* sif or vga */
-#define F_COARSE_EXPO 0x04      /* exposure control is coarse */
+#define F_SIF           0x01    /* sif or vga */
 
 /* priv field of struct v4l2_pix_format flags (do not use low nibble!) */
 #define MODE_RAW 0x10           /* raw bayer mode */
 #define MODE_REDUCED_SIF 0x20   /* vga mode (320x240 / 160x120) on sif cam */
 
-/* ctrl_dis helper macros */
-#define NO_EXPO ((1 << EXPOSURE) | (1 << AUTOGAIN))
-#define NO_FREQ (1 << FREQ)
-#define NO_BRIGHTNESS (1 << BRIGHTNESS)
-
 #define COMP 0xc7               /* 0x87 //0x07 */
 #define COMP1 0xc9              /* 0x89 //0x09 */
 
@@ -133,12 +115,12 @@ struct sensor_data {
 
 #define SYS_CLK 0x04
 
-#define SENS(bridge, sensor, _flags, _ctrl_dis, _sensor_addr) \
+#define SENS(bridge, sensor, _flags, _sensor_addr) \
 { \
         .bridge_init = bridge, \
         .sensor_init = sensor, \
         .sensor_init_size = sizeof(sensor), \
-        .flags = _flags, .ctrl_dis = _ctrl_dis, .sensor_addr = _sensor_addr \
+        .flags = _flags, .sensor_addr = _sensor_addr \
 }
 
 /* We calculate the autogain at the end of the transfer of a frame, at this
@@ -147,87 +129,6 @@ struct sensor_data {
    the new settings to come into effect before doing any other adjustments. */
 #define AUTOGAIN_IGNORE_FRAMES 1
 
-/* V4L2 controls supported by the driver */
-static void setbrightness(struct gspca_dev *gspca_dev);
-static void setgain(struct gspca_dev *gspca_dev);
-static void setexposure(struct gspca_dev *gspca_dev);
-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val);
-static void setfreq(struct gspca_dev *gspca_dev);
-
-static const struct ctrl sd_ctrls[NCTRLS] = {
-[BRIGHTNESS] = {
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-                .default_value = 127,
-            },
-            .set_control = setbrightness
-        },
-[GAIN] = {
-            {
-                .id      = V4L2_CID_GAIN,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Gain",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-#define GAIN_KNEE 230
-                .default_value = 127,
-            },
-            .set_control = setgain
-        },
-[EXPOSURE] = {
-                {
-                        .id = V4L2_CID_EXPOSURE,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "Exposure",
-                        .minimum = 0,
-                        .maximum = 1023,
-                        .step = 1,
-                        .default_value = 66,
-                                /*  33 ms / 30 fps (except on PASXXX) */
-#define EXPOSURE_KNEE 200       /* 100 ms / 10 fps (except on PASXXX) */
-                        .flags = 0,
-                },
-                .set_control = setexposure
-        },
-/* for coarse exposure */
-#define COARSE_EXPOSURE_MIN 2
-#define COARSE_EXPOSURE_MAX 15
-#define COARSE_EXPOSURE_DEF  2 /* 30 fps */
-[AUTOGAIN] = {
-                {
-                        .id = V4L2_CID_AUTOGAIN,
-                        .type = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name = "Automatic Gain (and Exposure)",
-                        .minimum = 0,
-                        .maximum = 1,
-                        .step = 1,
-#define AUTOGAIN_DEF 1
-                        .default_value = AUTOGAIN_DEF,
-                        .flags = V4L2_CTRL_FLAG_UPDATE
-                },
-                .set = sd_setautogain,
-        },
-[FREQ] = {
-                {
-                        .id      = V4L2_CID_POWER_LINE_FREQUENCY,
-                        .type    = V4L2_CTRL_TYPE_MENU,
-                        .name    = "Light frequency filter",
-                        .minimum = 0,
-                        .maximum = 2,   /* 0: 0, 1: 50Hz, 2:60Hz */
-                        .step    = 1,
-#define FREQ_DEF 0
-                        .default_value = FREQ_DEF,
-                },
-                .set_control = setfreq
-        },
-};
-
 static const struct v4l2_pix_format vga_mode[] = {
         {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
                 .bytesperline = 160,
@@ -532,25 +433,27 @@ static const __u8 tas5130_sensor_init[][8] = {
 };
 
 static const struct sensor_data sensor_data[] = {
-SENS(initHv7131d, hv7131d_sensor_init, F_GAIN, NO_BRIGHTNESS|NO_FREQ, 0),
-SENS(initHv7131r, hv7131r_sensor_init, 0, NO_BRIGHTNESS|NO_EXPO|NO_FREQ, 0),
-SENS(initOv6650, ov6650_sensor_init, F_GAIN|F_SIF, 0, 0x60),
-SENS(initOv7630, ov7630_sensor_init, F_GAIN, 0, 0x21),
-SENS(initPas106, pas106_sensor_init, F_GAIN|F_SIF, NO_FREQ, 0),
-SENS(initPas202, pas202_sensor_init, F_GAIN, NO_FREQ, 0),
-SENS(initTas5110c, tas5110c_sensor_init, F_GAIN|F_SIF|F_COARSE_EXPO,
-        NO_BRIGHTNESS|NO_FREQ, 0),
-SENS(initTas5110d, tas5110d_sensor_init, F_GAIN|F_SIF|F_COARSE_EXPO,
-        NO_BRIGHTNESS|NO_FREQ, 0),
-SENS(initTas5130, tas5130_sensor_init, F_GAIN,
-        NO_BRIGHTNESS|NO_EXPO|NO_FREQ, 0),
+        SENS(initHv7131d, hv7131d_sensor_init, 0, 0),
+        SENS(initHv7131r, hv7131r_sensor_init, 0, 0),
+        SENS(initOv6650, ov6650_sensor_init, F_SIF, 0x60),
+        SENS(initOv7630, ov7630_sensor_init, 0, 0x21),
+        SENS(initPas106, pas106_sensor_init, F_SIF, 0),
+        SENS(initPas202, pas202_sensor_init, 0, 0),
+        SENS(initTas5110c, tas5110c_sensor_init, F_SIF, 0),
+        SENS(initTas5110d, tas5110d_sensor_init, F_SIF, 0),
+        SENS(initTas5130, tas5130_sensor_init, 0, 0),
 };
 
 /* get one byte in gspca_dev->usb_buf */
 static void reg_r(struct gspca_dev *gspca_dev,
                   __u16 value)
 {
-        usb_control_msg(gspca_dev->dev,
+        int res;
+
+        if (gspca_dev->usb_err < 0)
+                return;
+
+        res = usb_control_msg(gspca_dev->dev,
                         usb_rcvctrlpipe(gspca_dev->dev, 0),
                         0,                      /* request */
                         USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
@@ -558,6 +461,12 @@ static void reg_r(struct gspca_dev *gspca_dev,
                         0,                      /* index */
                         gspca_dev->usb_buf, 1,
                         500);
+
+        if (res < 0) {
+                dev_err(gspca_dev->v4l2_dev.dev,
+                        "Error reading register %02x: %d\n", value, res);
+                gspca_dev->usb_err = res;
+        }
 }
 
 static void reg_w(struct gspca_dev *gspca_dev,
@@ -565,14 +474,13 @@ static void reg_w(struct gspca_dev *gspca_dev,
                   const __u8 *buffer,
                   int len)
 {
-#ifdef GSPCA_DEBUG
-        if (len > USB_BUF_SZ) {
-                PDEBUG(D_ERR|D_PACK, "reg_w: buffer overflow");
+        int res;
+
+        if (gspca_dev->usb_err < 0)
                 return;
-        }
-#endif
+
         memcpy(gspca_dev->usb_buf, buffer, len);
-        usb_control_msg(gspca_dev->dev,
+        res = usb_control_msg(gspca_dev->dev,
                         usb_sndctrlpipe(gspca_dev->dev, 0),
                         0x08,                   /* request */
                         USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
@@ -580,30 +488,48 @@ static void reg_w(struct gspca_dev *gspca_dev,
                         0,                      /* index */
                         gspca_dev->usb_buf, len,
                         500);
+
+        if (res < 0) {
+                dev_err(gspca_dev->v4l2_dev.dev,
+                        "Error writing register %02x: %d\n", value, res);
+                gspca_dev->usb_err = res;
+        }
 }
 
-static int i2c_w(struct gspca_dev *gspca_dev, const __u8 *buffer)
+static void i2c_w(struct gspca_dev *gspca_dev, const __u8 *buffer)
 {
         int retry = 60;
 
+        if (gspca_dev->usb_err < 0)
+                return;
+
         /* is i2c ready */
         reg_w(gspca_dev, 0x08, buffer, 8);
         while (retry--) {
+                if (gspca_dev->usb_err < 0)
+                        return;
                 msleep(10);
                 reg_r(gspca_dev, 0x08);
                 if (gspca_dev->usb_buf[0] & 0x04) {
-                        if (gspca_dev->usb_buf[0] & 0x08)
-                                return -1;
-                        return 0;
+                        if (gspca_dev->usb_buf[0] & 0x08) {
+                                dev_err(gspca_dev->v4l2_dev.dev,
+                                        "i2c write error\n");
+                                gspca_dev->usb_err = -EIO;
+                        }
+                        return;
                 }
         }
-        return -1;
+
+        dev_err(gspca_dev->v4l2_dev.dev, "i2c write timeout\n");
+        gspca_dev->usb_err = -EIO;
 }
 
 static void i2c_w_vector(struct gspca_dev *gspca_dev,
                         const __u8 buffer[][8], int len)
 {
         for (;;) {
+                if (gspca_dev->usb_err < 0)
+                        return;
                 reg_w(gspca_dev, 0x08, *buffer, 8);
                 len -= 8;
                 if (len <= 0)
@@ -624,11 +550,10 @@ static void setbrightness(struct gspca_dev *gspca_dev)
 
                 /* change reg 0x06 */
                 i2cOV[1] = sensor_data[sd->sensor].sensor_addr;
-                i2cOV[3] = sd->ctrls[BRIGHTNESS].val;
-                if (i2c_w(gspca_dev, i2cOV) < 0)
-                        goto err;
+                i2cOV[3] = sd->brightness->val;
+                i2c_w(gspca_dev, i2cOV);
                 break;
-            }
+        }
         case SENSOR_PAS106:
         case SENSOR_PAS202: {
                 __u8 i2cpbright[] =
@@ -642,54 +567,49 @@ static void setbrightness(struct gspca_dev *gspca_dev)
                         i2cpdoit[2] = 0x13;
                 }
 
-                if (sd->ctrls[BRIGHTNESS].val < 127) {
+                if (sd->brightness->val < 127) {
                         /* change reg 0x0b, signreg */
                         i2cpbright[3] = 0x01;
                         /* set reg 0x0c, offset */
-                        i2cpbright[4] = 127 - sd->ctrls[BRIGHTNESS].val;
+                        i2cpbright[4] = 127 - sd->brightness->val;
                 } else
-                        i2cpbright[4] = sd->ctrls[BRIGHTNESS].val - 127;
+                        i2cpbright[4] = sd->brightness->val - 127;
 
-                if (i2c_w(gspca_dev, i2cpbright) < 0)
-                        goto err;
-                if (i2c_w(gspca_dev, i2cpdoit) < 0)
-                        goto err;
+                i2c_w(gspca_dev, i2cpbright);
+                i2c_w(gspca_dev, i2cpdoit);
+                break;
+        }
+        default:
                 break;
-            }
         }
-        return;
-err:
-        PDEBUG(D_ERR, "i2c error brightness");
 }
 
-static void setsensorgain(struct gspca_dev *gspca_dev)
+static void setgain(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        u8 gain = sd->ctrls[GAIN].val;
+        u8 gain = gspca_dev->gain->val;
 
         switch (sd->sensor) {
         case SENSOR_HV7131D: {
                 __u8 i2c[] =
                         {0xc0, 0x11, 0x31, 0x00, 0x00, 0x00, 0x00, 0x17};
 
-                i2c[3] = 0x3f - (gain / 4);
-                i2c[4] = 0x3f - (gain / 4);
-                i2c[5] = 0x3f - (gain / 4);
+                i2c[3] = 0x3f - gain;
+                i2c[4] = 0x3f - gain;
+                i2c[5] = 0x3f - gain;
 
-                if (i2c_w(gspca_dev, i2c) < 0)
-                        goto err;
+                i2c_w(gspca_dev, i2c);
                 break;
-            }
+        }
         case SENSOR_TAS5110C:
         case SENSOR_TAS5130CXX: {
                 __u8 i2c[] =
                         {0x30, 0x11, 0x02, 0x20, 0x70, 0x00, 0x00, 0x10};
 
                 i2c[4] = 255 - gain;
-                if (i2c_w(gspca_dev, i2c) < 0)
-                        goto err;
+                i2c_w(gspca_dev, i2c);
                 break;
-            }
+        }
         case SENSOR_TAS5110D: {
                 __u8 i2c[] = {
                         0xb0, 0x61, 0x02, 0x00, 0x10, 0x00, 0x00, 0x17 };
@@ -703,23 +623,25 @@ static void setsensorgain(struct gspca_dev *gspca_dev)
                 i2c[3] |= (gain & 0x04) << 3;
                 i2c[3] |= (gain & 0x02) << 5;
                 i2c[3] |= (gain & 0x01) << 7;
-                if (i2c_w(gspca_dev, i2c) < 0)
-                        goto err;
+                i2c_w(gspca_dev, i2c);
                 break;
-            }
-
+        }
         case SENSOR_OV6650:
-                gain >>= 1;
-                /* fall thru */
         case SENSOR_OV7630: {
                 __u8 i2c[] = {0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10};
 
+                /*
+                 * The ov7630's gain is weird, at 32 the gain drops to the
+                 * same level as at 16, so skip 32-47 (of the 0-63 scale).
+                 */
+                if (sd->sensor == SENSOR_OV7630 && gain >= 32)
+                        gain += 16;
+
                 i2c[1] = sensor_data[sd->sensor].sensor_addr;
-                i2c[3] = gain >> 2;
-                if (i2c_w(gspca_dev, i2c) < 0)
-                        goto err;
+                i2c[3] = gain;
+                i2c_w(gspca_dev, i2c);
                 break;
-            }
+        }
         case SENSOR_PAS106:
         case SENSOR_PAS202: {
                 __u8 i2cpgain[] =
@@ -737,49 +659,27 @@ static void setsensorgain(struct gspca_dev *gspca_dev)
                         i2cpdoit[2] = 0x13;
                 }
 
-                i2cpgain[3] = gain >> 3;
-                i2cpcolorgain[3] = gain >> 4;
-                i2cpcolorgain[4] = gain >> 4;
-                i2cpcolorgain[5] = gain >> 4;
-                i2cpcolorgain[6] = gain >> 4;
-
-                if (i2c_w(gspca_dev, i2cpgain) < 0)
-                        goto err;
-                if (i2c_w(gspca_dev, i2cpcolorgain) < 0)
-                        goto err;
-                if (i2c_w(gspca_dev, i2cpdoit) < 0)
-                        goto err;
-                break;
-            }
-        }
-        return;
-err:
-        PDEBUG(D_ERR, "i2c error gain");
-}
-
-static void setgain(struct gspca_dev *gspca_dev)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-        __u8 gain;
-        __u8 buf[3] = { 0, 0, 0 };
+                i2cpgain[3] = gain;
+                i2cpcolorgain[3] = gain >> 1;
+                i2cpcolorgain[4] = gain >> 1;
+                i2cpcolorgain[5] = gain >> 1;
+                i2cpcolorgain[6] = gain >> 1;
 
-        if (sensor_data[sd->sensor].flags & F_GAIN) {
-                /* Use the sensor gain to do the actual gain */
-                setsensorgain(gspca_dev);
-                return;
+                i2c_w(gspca_dev, i2cpgain);
+                i2c_w(gspca_dev, i2cpcolorgain);
+                i2c_w(gspca_dev, i2cpdoit);
+                break;
         }
-
-        if (sd->bridge == BRIDGE_103) {
-                gain = sd->ctrls[GAIN].val >> 1;
-                buf[0] = gain; /* Red */
-                buf[1] = gain; /* Green */
-                buf[2] = gain; /* Blue */
-                reg_w(gspca_dev, 0x05, buf, 3);
-        } else {
-                gain = sd->ctrls[GAIN].val >> 4;
-                buf[0] = gain << 4 | gain; /* Red and blue */
-                buf[1] = gain; /* Green */
-                reg_w(gspca_dev, 0x10, buf, 2);
+        default:
+                if (sd->bridge == BRIDGE_103) {
+                        u8 buf[3] = { gain, gain, gain }; /* R, G, B */
+                        reg_w(gspca_dev, 0x05, buf, 3);
+                } else {
+                        u8 buf[2];
+                        buf[0] = gain << 4 | gain; /* Red and blue */
+                        buf[1] = gain; /* Green */
+                        reg_w(gspca_dev, 0x10, buf, 2);
+                }
         }
 }
 
@@ -792,31 +692,24 @@ static void setexposure(struct gspca_dev *gspca_dev)
                 /* Note the datasheet wrongly says line mode exposure uses reg
                    0x26 and 0x27, testing has shown 0x25 + 0x26 */
                 __u8 i2c[] = {0xc0, 0x11, 0x25, 0x00, 0x00, 0x00, 0x00, 0x17};
-                /* The HV7131D's exposure goes from 0 - 65535, we scale our
-                   exposure of 0-1023 to 0-6138. There are 2 reasons for this:
-                   1) This puts our exposure knee of 200 at approx the point
-                      where the framerate starts dropping
-                   2) At 6138 the framerate has already dropped to 2 fps,
-                      going any lower makes little sense */
-                u16 reg = sd->ctrls[EXPOSURE].val * 6;
+                u16 reg = gspca_dev->exposure->val;
 
                 i2c[3] = reg >> 8;
                 i2c[4] = reg & 0xff;
-                if (i2c_w(gspca_dev, i2c) != 0)
-                        goto err;
+                i2c_w(gspca_dev, i2c);
                 break;
-            }
+        }
         case SENSOR_TAS5110C:
         case SENSOR_TAS5110D: {
                 /* register 19's high nibble contains the sn9c10x clock divider
                    The high nibble configures the no fps according to the
                    formula: 60 / high_nibble. With a maximum of 30 fps */
-                u8 reg = sd->ctrls[EXPOSURE].val;
+                u8 reg = gspca_dev->exposure->val;
 
                 reg = (reg << 4) | 0x0b;
                 reg_w(gspca_dev, 0x19, &reg, 1);
                 break;
-            }
+        }
         case SENSOR_OV6650:
         case SENSOR_OV7630: {
                 /* The ov6650 / ov7630 have 2 registers which both influence
@@ -848,7 +741,7 @@ static void setexposure(struct gspca_dev *gspca_dev)
                 } else
                         reg10_max = 0x41;
 
-                reg11 = (15 * sd->ctrls[EXPOSURE].val + 999) / 1000;
+                reg11 = (15 * gspca_dev->exposure->val + 999) / 1000;
                 if (reg11 < 1)
                         reg11 = 1;
                 else if (reg11 > 16)
@@ -861,16 +754,16 @@ static void setexposure(struct gspca_dev *gspca_dev)
                         reg11 = 4;
 
                 /* frame exposure time in ms = 1000 * reg11 / 30    ->
-                reg10 = (sd->ctrls[EXPOSURE].val / 2) * reg10_max
+                reg10 = (gspca_dev->exposure->val / 2) * reg10_max
                                 / (1000 * reg11 / 30) */
-                reg10 = (sd->ctrls[EXPOSURE].val * 15 * reg10_max)
+                reg10 = (gspca_dev->exposure->val * 15 * reg10_max)
                                 / (1000 * reg11);
 
                 /* Don't allow this to get below 10 when using autogain, the
                    steps become very large (relatively) when below 10 causing
                    the image to oscilate from much too dark, to much too bright
                    and back again. */
-                if (sd->ctrls[AUTOGAIN].val && reg10 < 10)
+                if (gspca_dev->autogain->val && reg10 < 10)
                         reg10 = 10;
                 else if (reg10 > reg10_max)
                         reg10 = reg10_max;
@@ -884,12 +777,11 @@ static void setexposure(struct gspca_dev *gspca_dev)
                 if (sd->reg11 == reg11)
                         i2c[0] = 0xa0;
 
-                if (i2c_w(gspca_dev, i2c) == 0)
+                i2c_w(gspca_dev, i2c);
+                if (gspca_dev->usb_err == 0)
                         sd->reg11 = reg11;
-                else
-                        goto err;
                 break;
-            }
+        }
         case SENSOR_PAS202: {
                 __u8 i2cpframerate[] =
                         {0xb0, 0x40, 0x04, 0x00, 0x00, 0x00, 0x00, 0x16};
@@ -909,28 +801,25 @@ static void setexposure(struct gspca_dev *gspca_dev)
                    frame exposure times (like we are doing with the ov chips),
                    as that sometimes leads to jumps in the exposure control,
                    which are bad for auto exposure. */
-                if (sd->ctrls[EXPOSURE].val < 200) {
-                        i2cpexpo[3] = 255 - (sd->ctrls[EXPOSURE].val * 255)
+                if (gspca_dev->exposure->val < 200) {
+                        i2cpexpo[3] = 255 - (gspca_dev->exposure->val * 255)
                                                 / 200;
                         framerate_ctrl = 500;
                 } else {
                         /* The PAS202's exposure control goes from 0 - 4095,
                            but anything below 500 causes vsync issues, so scale
                            our 200-1023 to 500-4095 */
-                        framerate_ctrl = (sd->ctrls[EXPOSURE].val - 200)
+                        framerate_ctrl = (gspca_dev->exposure->val - 200)
                                                         * 1000 / 229 +  500;
                 }
 
                 i2cpframerate[3] = framerate_ctrl >> 6;
                 i2cpframerate[4] = framerate_ctrl & 0x3f;
-                if (i2c_w(gspca_dev, i2cpframerate) < 0)
-                        goto err;
-                if (i2c_w(gspca_dev, i2cpexpo) < 0)
-                        goto err;
-                if (i2c_w(gspca_dev, i2cpdoit) < 0)
-                        goto err;
+                i2c_w(gspca_dev, i2cpframerate);
+                i2c_w(gspca_dev, i2cpexpo);
+                i2c_w(gspca_dev, i2cpdoit);
                 break;
-            }
+        }
         case SENSOR_PAS106: {
                 __u8 i2cpframerate[] =
                         {0xb1, 0x40, 0x03, 0x00, 0x00, 0x00, 0x00, 0x14};
@@ -942,46 +831,40 @@ static void setexposure(struct gspca_dev *gspca_dev)
 
                 /* For values below 150 use partial frame exposure, above
                    that use framerate ctrl */
-                if (sd->ctrls[EXPOSURE].val < 150) {
-                        i2cpexpo[3] = 150 - sd->ctrls[EXPOSURE].val;
+                if (gspca_dev->exposure->val < 150) {
+                        i2cpexpo[3] = 150 - gspca_dev->exposure->val;
                         framerate_ctrl = 300;
                 } else {
                         /* The PAS106's exposure control goes from 0 - 4095,
                            but anything below 300 causes vsync issues, so scale
                            our 150-1023 to 300-4095 */
-                        framerate_ctrl = (sd->ctrls[EXPOSURE].val - 150)
+                        framerate_ctrl = (gspca_dev->exposure->val - 150)
                                                 * 1000 / 230 + 300;
                 }
 
                 i2cpframerate[3] = framerate_ctrl >> 4;
                 i2cpframerate[4] = framerate_ctrl & 0x0f;
-                if (i2c_w(gspca_dev, i2cpframerate) < 0)
-                        goto err;
-                if (i2c_w(gspca_dev, i2cpexpo) < 0)
-                        goto err;
-                if (i2c_w(gspca_dev, i2cpdoit) < 0)
-                        goto err;
+                i2c_w(gspca_dev, i2cpframerate);
+                i2c_w(gspca_dev, i2cpexpo);
+                i2c_w(gspca_dev, i2cpdoit);
+                break;
+        }
+        default:
                 break;
-            }
         }
-        return;
-err:
-        PDEBUG(D_ERR, "i2c error exposure");
 }
 
 static void setfreq(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        switch (sd->sensor) {
-        case SENSOR_OV6650:
-        case SENSOR_OV7630: {
+        if (sd->sensor == SENSOR_OV6650 || sd->sensor == SENSOR_OV7630) {
                 /* Framerate adjust register for artificial light 50 hz flicker
                    compensation, for the ov6650 this is identical to ov6630
                    0x2b register, see ov6630 datasheet.
                    0x4f / 0x8a -> (30 fps -> 25 fps), 0x00 -> no adjustment */
                 __u8 i2c[] = {0xa0, 0x00, 0x2b, 0x00, 0x00, 0x00, 0x00, 0x10};
-                switch (sd->ctrls[FREQ].val) {
+                switch (sd->plfreq->val) {
                 default:
 /*              case 0:                  * no filter*/
 /*              case 2:                  * 60 hz */
@@ -993,25 +876,17 @@ static void setfreq(struct gspca_dev *gspca_dev)
                         break;
                 }
                 i2c[1] = sensor_data[sd->sensor].sensor_addr;
-                if (i2c_w(gspca_dev, i2c) < 0)
-                        PDEBUG(D_ERR, "i2c error setfreq");
-                break;
-            }
+                i2c_w(gspca_dev, i2c);
         }
 }
 
-#define WANT_REGULAR_AUTOGAIN
-#define WANT_COARSE_EXPO_AUTOGAIN
-#include "autogain_functions.h"
-
 static void do_autogain(struct gspca_dev *gspca_dev)
 {
-        int deadzone, desired_avg_lum, result;
         struct sd *sd = (struct sd *) gspca_dev;
-        int avg_lum = atomic_read(&sd->avg_lum);
+        int deadzone, desired_avg_lum, avg_lum;
 
-        if ((gspca_dev->ctrl_dis & (1 << AUTOGAIN)) ||
-            avg_lum == -1 || !sd->ctrls[AUTOGAIN].val)
+        avg_lum = atomic_read(&sd->avg_lum);
+        if (avg_lum == -1)
                 return;
 
         if (sd->autogain_ignore_frames > 0) {
@@ -1030,22 +905,18 @@ static void do_autogain(struct gspca_dev *gspca_dev)
                 desired_avg_lum = 13000;
         }
 
-        if (sensor_data[sd->sensor].flags & F_COARSE_EXPO)
-                result = coarse_grained_expo_autogain(gspca_dev, avg_lum,
-                                sd->ctrls[BRIGHTNESS].val
-                                                * desired_avg_lum / 127,
-                                deadzone);
-        else
-                result = auto_gain_n_exposure(gspca_dev, avg_lum,
-                                sd->ctrls[BRIGHTNESS].val
-                                                * desired_avg_lum / 127,
-                                deadzone, GAIN_KNEE, EXPOSURE_KNEE);
-
-        if (result) {
-                PDEBUG(D_FRAM, "autogain: gain changed: gain: %d expo: %d",
-                        (int) sd->ctrls[GAIN].val,
-                        (int) sd->ctrls[EXPOSURE].val);
-                sd->autogain_ignore_frames = AUTOGAIN_IGNORE_FRAMES;
+        if (sd->brightness)
+                desired_avg_lum = sd->brightness->val * desired_avg_lum / 127;
+
+        if (gspca_dev->exposure->maximum < 500) {
+                if (gspca_coarse_grained_expo_autogain(gspca_dev, avg_lum,
+                                desired_avg_lum, deadzone))
+                        sd->autogain_ignore_frames = AUTOGAIN_IGNORE_FRAMES;
+        } else {
+                int gain_knee = gspca_dev->gain->maximum * 9 / 10;
+                if (gspca_expo_autogain(gspca_dev, avg_lum, desired_avg_lum,
+                                deadzone, gain_knee, sd->exposure_knee))
+                        sd->autogain_ignore_frames = AUTOGAIN_IGNORE_FRAMES;
         }
 }
 
@@ -1064,14 +935,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
         sd->sensor = id->driver_info >> 8;
         sd->bridge = id->driver_info & 0xff;
 
-        gspca_dev->ctrl_dis = sensor_data[sd->sensor].ctrl_dis;
-#if AUTOGAIN_DEF
-        if (!(gspca_dev->ctrl_dis & (1 << AUTOGAIN)))
-                gspca_dev->ctrl_inac = (1 << GAIN) | (1 << EXPOSURE);
-#endif
-
         cam = &gspca_dev->cam;
-        cam->ctrls = sd->ctrls;
         if (!(sensor_data[sd->sensor].flags & F_SIF)) {
                 cam->cam_mode = vga_mode;
                 cam->nmodes = ARRAY_SIZE(vga_mode);
@@ -1087,18 +951,143 @@ static int sd_config(struct gspca_dev *gspca_dev,
 /* this function is called at probe and resume time */
 static int sd_init(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         const __u8 stop = 0x09; /* Disable stream turn of LED */
 
-        if (sensor_data[sd->sensor].flags & F_COARSE_EXPO) {
-                sd->ctrls[EXPOSURE].min = COARSE_EXPOSURE_MIN;
-                sd->ctrls[EXPOSURE].max = COARSE_EXPOSURE_MAX;
-                sd->ctrls[EXPOSURE].def = COARSE_EXPOSURE_DEF;
-                if (sd->ctrls[EXPOSURE].val > COARSE_EXPOSURE_MAX)
-                        sd->ctrls[EXPOSURE].val = COARSE_EXPOSURE_DEF;
+        reg_w(gspca_dev, 0x01, &stop, 1);
+
+        return gspca_dev->usb_err;
+}
+
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
+
+        gspca_dev->usb_err = 0;
+
+        if (ctrl->id == V4L2_CID_AUTOGAIN && ctrl->is_new && ctrl->val) {
+                /* when switching to autogain set defaults to make sure
+                   we are on a valid point of the autogain gain /
+                   exposure knee graph, and give this change time to
+                   take effect before doing autogain. */
+                gspca_dev->gain->val = gspca_dev->gain->default_value;
+                gspca_dev->exposure->val = gspca_dev->exposure->default_value;
+                sd->autogain_ignore_frames = AUTOGAIN_IGNORE_FRAMES;
         }
 
-        reg_w(gspca_dev, 0x01, &stop, 1);
+        if (!gspca_dev->streaming)
+                return 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev);
+                break;
+        case V4L2_CID_AUTOGAIN:
+                if (gspca_dev->exposure->is_new || (ctrl->is_new && ctrl->val))
+                        setexposure(gspca_dev);
+                if (gspca_dev->gain->is_new || (ctrl->is_new && ctrl->val))
+                        setgain(gspca_dev);
+                break;
+        case V4L2_CID_POWER_LINE_FREQUENCY:
+                setfreq(gspca_dev);
+                break;
+        default:
+                return -EINVAL;
+        }
+        return gspca_dev->usb_err;
+}
+
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
+
+/* this function is called at probe time */
+static int sd_init_controls(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 5);
+
+        if (sd->sensor == SENSOR_OV6650 || sd->sensor == SENSOR_OV7630 ||
+            sd->sensor == SENSOR_PAS106 || sd->sensor == SENSOR_PAS202)
+                sd->brightness = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_BRIGHTNESS, 0, 255, 1, 127);
+
+        /* Gain range is sensor dependent */
+        switch (sd->sensor) {
+        case SENSOR_OV6650:
+        case SENSOR_PAS106:
+        case SENSOR_PAS202:
+                gspca_dev->gain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_GAIN, 0, 31, 1, 15);
+                break;
+        case SENSOR_OV7630:
+                gspca_dev->gain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_GAIN, 0, 47, 1, 31);
+                break;
+        case SENSOR_HV7131D:
+                gspca_dev->gain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_GAIN, 0, 63, 1, 31);
+                break;
+        case SENSOR_TAS5110C:
+        case SENSOR_TAS5110D:
+        case SENSOR_TAS5130CXX:
+                gspca_dev->gain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_GAIN, 0, 255, 1, 127);
+                break;
+        default:
+                if (sd->bridge == BRIDGE_103) {
+                        gspca_dev->gain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                                V4L2_CID_GAIN, 0, 127, 1, 63);
+                } else {
+                        gspca_dev->gain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                                V4L2_CID_GAIN, 0, 15, 1, 7);
+                }
+        }
+
+        /* Exposure range is sensor dependent, and not all have exposure */
+        switch (sd->sensor) {
+        case SENSOR_HV7131D:
+                gspca_dev->exposure = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_EXPOSURE, 0, 8191, 1, 482);
+                sd->exposure_knee = 964;
+                break;
+        case SENSOR_OV6650:
+        case SENSOR_OV7630:
+        case SENSOR_PAS106:
+        case SENSOR_PAS202:
+                gspca_dev->exposure = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_EXPOSURE, 0, 1023, 1, 66);
+                sd->exposure_knee = 200;
+                break;
+        case SENSOR_TAS5110C:
+        case SENSOR_TAS5110D:
+                gspca_dev->exposure = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                        V4L2_CID_EXPOSURE, 2, 15, 1, 2);
+                break;
+        }
+
+        if (gspca_dev->exposure) {
+                gspca_dev->autogain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                                V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+        }
+
+        if (sd->sensor == SENSOR_OV6650 || sd->sensor == SENSOR_OV7630)
+                sd->plfreq = v4l2_ctrl_new_std_menu(hdl, &sd_ctrl_ops,
+                        V4L2_CID_POWER_LINE_FREQUENCY,
+                        V4L2_CID_POWER_LINE_FREQUENCY_60HZ, 0,
+                        V4L2_CID_POWER_LINE_FREQUENCY_DISABLED);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+
+        if (gspca_dev->autogain)
+                v4l2_ctrl_auto_cluster(3, &gspca_dev->autogain, 0, false);
 
         return 0;
 }
@@ -1242,10 +1231,10 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
         sd->frames_to_drop = 0;
         sd->autogain_ignore_frames = 0;
-        sd->exp_too_high_cnt = 0;
-        sd->exp_too_low_cnt = 0;
+        gspca_dev->exp_too_high_cnt = 0;
+        gspca_dev->exp_too_low_cnt = 0;
         atomic_set(&sd->avg_lum, -1);
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
@@ -1387,37 +1376,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         }
 }
 
-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->ctrls[AUTOGAIN].val = val;
-        sd->exp_too_high_cnt = 0;
-        sd->exp_too_low_cnt = 0;
-
-        /* when switching to autogain set defaults to make sure
-           we are on a valid point of the autogain gain /
-           exposure knee graph, and give this change time to
-           take effect before doing autogain. */
-        if (sd->ctrls[AUTOGAIN].val
-         && !(sensor_data[sd->sensor].flags & F_COARSE_EXPO)) {
-                sd->ctrls[EXPOSURE].val = sd->ctrls[EXPOSURE].def;
-                sd->ctrls[GAIN].val = sd->ctrls[GAIN].def;
-                if (gspca_dev->streaming) {
-                        sd->autogain_ignore_frames = AUTOGAIN_IGNORE_FRAMES;
-                        setexposure(gspca_dev);
-                        setgain(gspca_dev);
-                }
-        }
-
-        if (sd->ctrls[AUTOGAIN].val)
-                gspca_dev->ctrl_inac = (1 << GAIN) | (1 << EXPOSURE);
-        else
-                gspca_dev->ctrl_inac = 0;
-
-        return 0;
-}
-
 static int sd_querymenu(struct gspca_dev *gspca_dev,
                         struct v4l2_querymenu *menu)
 {
@@ -1461,10 +1419,9 @@ static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
         .pkt_scan = sd_pkt_scan,
@@ -1529,6 +1486,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index f38faa9b37c3..150b2df40f7f 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -3199,6 +3199,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/spca1528.c b/drivers/media/video/gspca/spca1528.c
index 070b9c33b517..14d635277d71 100644
--- a/drivers/media/video/gspca/spca1528.c
+++ b/drivers/media/video/gspca/spca1528.c
@@ -33,102 +33,11 @@ MODULE_LICENSE("GPL");
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
 
-        u8 brightness;
-        u8 contrast;
-        u8 hue;
-        u8 color;
-        u8 sharpness;
-
         u8 pkt_seq;
 
         u8 jpeg_hdr[JPEG_HDR_SZ];
 };
 
-/* V4L2 controls supported by the driver */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_sethue(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_gethue(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcolor(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcolor(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val);
-
-static const struct ctrl sd_ctrls[] = {
-        {
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-#define BRIGHTNESS_DEF 128
-                .default_value = BRIGHTNESS_DEF,
-            },
-            .set = sd_setbrightness,
-            .get = sd_getbrightness,
-        },
-        {
-            {
-                .id      = V4L2_CID_CONTRAST,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Contrast",
-                .minimum = 0,
-                .maximum = 8,
-                .step    = 1,
-#define CONTRAST_DEF 1
-                .default_value = CONTRAST_DEF,
-            },
-            .set = sd_setcontrast,
-            .get = sd_getcontrast,
-        },
-        {
-            {
-                .id      = V4L2_CID_HUE,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Hue",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-#define HUE_DEF 0
-                .default_value = HUE_DEF,
-            },
-            .set = sd_sethue,
-            .get = sd_gethue,
-        },
-        {
-            {
-                .id      = V4L2_CID_SATURATION,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Saturation",
-                .minimum = 0,
-                .maximum = 8,
-                .step    = 1,
-#define COLOR_DEF 1
-                .default_value = COLOR_DEF,
-            },
-            .set = sd_setcolor,
-            .get = sd_getcolor,
-        },
-        {
-            {
-                .id      = V4L2_CID_SHARPNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Sharpness",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-#define SHARPNESS_DEF 0
-                .default_value = SHARPNESS_DEF,
-            },
-            .set = sd_setsharpness,
-            .get = sd_getsharpness,
-        },
-};
-
 static const struct v4l2_pix_format vga_mode[] = {
 /*              (does not work correctly)
         {176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
@@ -259,58 +168,40 @@ static void wait_status_1(struct gspca_dev *gspca_dev)
         gspca_dev->usb_err = -ETIME;
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        reg_wb(gspca_dev, 0xc0, 0x0000, 0x00c0, sd->brightness);
+        reg_wb(gspca_dev, 0xc0, 0x0000, 0x00c0, val);
 }
 
-static void setcontrast(struct gspca_dev *gspca_dev)
+static void setcontrast(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        reg_wb(gspca_dev, 0xc1, 0x0000, 0x00c1, sd->contrast);
+        reg_wb(gspca_dev, 0xc1, 0x0000, 0x00c1, val);
 }
 
-static void sethue(struct gspca_dev *gspca_dev)
+static void sethue(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        reg_wb(gspca_dev, 0xc2, 0x0000, 0x0000, sd->hue);
+        reg_wb(gspca_dev, 0xc2, 0x0000, 0x0000, val);
 }
 
-static void setcolor(struct gspca_dev *gspca_dev)
+static void setcolor(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        reg_wb(gspca_dev, 0xc3, 0x0000, 0x00c3, sd->color);
+        reg_wb(gspca_dev, 0xc3, 0x0000, 0x00c3, val);
 }
 
-static void setsharpness(struct gspca_dev *gspca_dev)
+static void setsharpness(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        reg_wb(gspca_dev, 0xc4, 0x0000, 0x00c4, sd->sharpness);
+        reg_wb(gspca_dev, 0xc4, 0x0000, 0x00c4, val);
 }
 
 /* this function is called at probe time */
 static int sd_config(struct gspca_dev *gspca_dev,
                         const struct usb_device_id *id)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
         gspca_dev->cam.cam_mode = vga_mode;
         gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode);
         gspca_dev->cam.npkt = 128; /* number of packets per ISOC message */
                         /*fixme: 256 in ms-win traces*/
 
-        sd->brightness = BRIGHTNESS_DEF;
-        sd->contrast = CONTRAST_DEF;
-        sd->hue = HUE_DEF;
-        sd->color = COLOR_DEF;
-        sd->sharpness = SHARPNESS_DEF;
-
         return 0;
 }
 
@@ -370,14 +261,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
         /* the JPEG quality shall be 85% */
         jpeg_set_qual(sd->jpeg_hdr, 85);
 
-        /* set the controls */
-        setbrightness(gspca_dev);
-        setcontrast(gspca_dev);
-        sethue(gspca_dev);
-        setcolor(gspca_dev);
-        setsharpness(gspca_dev);
-
-        msleep(5);
         reg_r(gspca_dev, 0x00, 0x2520, 1);
         msleep(8);
 
@@ -457,103 +340,70 @@ err:
         gspca_dev->last_packet_type = DISCARD_PACKET;
 }
 
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->brightness = val;
-        if (gspca_dev->streaming)
-                setbrightness(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->brightness;
-        return 0;
-}
-
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->contrast = val;
-        if (gspca_dev->streaming)
-                setcontrast(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->contrast;
-        return 0;
-}
-
-static int sd_sethue(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->hue = val;
-        if (gspca_dev->streaming)
-                sethue(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
-static int sd_gethue(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->hue;
-        return 0;
-}
-
-static int sd_setcolor(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->color = val;
-        if (gspca_dev->streaming)
-                setcolor(gspca_dev);
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+
+        gspca_dev->usb_err = 0;
+
+        if (!gspca_dev->streaming)
+                return 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                setcontrast(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_HUE:
+                sethue(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_SATURATION:
+                setcolor(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_SHARPNESS:
+                setsharpness(gspca_dev, ctrl->val);
+                break;
+        }
         return gspca_dev->usb_err;
 }
 
-static int sd_getcolor(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->color;
-        return 0;
-}
-
-static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->sharpness = val;
-        if (gspca_dev->streaming)
-                setsharpness(gspca_dev);
-        return gspca_dev->usb_err;
-}
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
 
-static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val)
+static int sd_init_controls(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->sharpness;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 5);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 255, 1, 128);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, 8, 1, 1);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_HUE, 0, 255, 1, 0);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SATURATION, 0, 8, 1, 1);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SHARPNESS, 0, 255, 1, 0);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
         return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .isoc_init = sd_isoc_init,
         .start = sd_start,
         .stopN = sd_stopN,
@@ -587,6 +437,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c
index 103984708c77..25cb68d0556d 100644
--- a/drivers/media/video/gspca/spca500.c
+++ b/drivers/media/video/gspca/spca500.c
@@ -30,18 +30,12 @@ MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/SPCA500 USB Camera Driver");
 MODULE_LICENSE("GPL");
 
+#define QUALITY 85
+
 /* specific webcam descriptor */
 struct sd {
         struct gspca_dev gspca_dev;             /* !! must be the first item */
 
-        unsigned char brightness;
-        unsigned char contrast;
-        unsigned char colors;
-        u8 quality;
-#define QUALITY_MIN 70
-#define QUALITY_MAX 95
-#define QUALITY_DEF 85
-
         char subtype;
 #define AgfaCl20 0
 #define AiptekPocketDV 1
@@ -62,59 +56,6 @@ struct sd {
         u8 jpeg_hdr[JPEG_HDR_SZ];
 };
 
-/* V4L2 controls supported by the driver */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);
-
-static const struct ctrl sd_ctrls[] = {
-        {
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-#define BRIGHTNESS_DEF 127
-                .default_value = BRIGHTNESS_DEF,
-            },
-            .set = sd_setbrightness,
-            .get = sd_getbrightness,
-        },
-        {
-            {
-                .id      = V4L2_CID_CONTRAST,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Contrast",
-                .minimum = 0,
-                .maximum = 63,
-                .step    = 1,
-#define CONTRAST_DEF 31
-                .default_value = CONTRAST_DEF,
-            },
-            .set = sd_setcontrast,
-            .get = sd_getcontrast,
-        },
-        {
-            {
-                .id      = V4L2_CID_SATURATION,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Color",
-                .minimum = 0,
-                .maximum = 63,
-                .step    = 1,
-#define COLOR_DEF 31
-                .default_value = COLOR_DEF,
-            },
-            .set = sd_setcolors,
-            .get = sd_getcolors,
-        },
-};
-
 static const struct v4l2_pix_format vga_mode[] = {
         {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 320,
@@ -641,10 +582,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
                 cam->cam_mode = sif_mode;
                 cam->nmodes = ARRAY_SIZE(sif_mode);
         }
-        sd->brightness = BRIGHTNESS_DEF;
-        sd->contrast = CONTRAST_DEF;
-        sd->colors = COLOR_DEF;
-        sd->quality = QUALITY_DEF;
         return 0;
 }
 
@@ -673,7 +610,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
         /* create the JPEG header */
         jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width,
                         0x22);          /* JPEG 411 */
-        jpeg_set_qual(sd->jpeg_hdr, sd->quality);
+        jpeg_set_qual(sd->jpeg_hdr, QUALITY);
 
         if (sd->subtype == LogitechClickSmart310) {
                 xmult = 0x16;
@@ -934,122 +871,79 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
         reg_w(gspca_dev, 0x00, 0x8167,
-                        (__u8) (sd->brightness - 128));
+                        (__u8) (val - 128));
 }
 
-static void setcontrast(struct gspca_dev *gspca_dev)
+static void setcontrast(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        reg_w(gspca_dev, 0x00, 0x8168, sd->contrast);
+        reg_w(gspca_dev, 0x00, 0x8168, val);
 }
 
-static void setcolors(struct gspca_dev *gspca_dev)
+static void setcolors(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        reg_w(gspca_dev, 0x00, 0x8169, sd->colors);
+        reg_w(gspca_dev, 0x00, 0x8169, val);
 }
 
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
 
-        sd->brightness = val;
-        if (gspca_dev->streaming)
-                setbrightness(gspca_dev);
-        return 0;
-}
+        gspca_dev->usb_err = 0;
 
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->brightness;
-        return 0;
-}
-
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->contrast = val;
-        if (gspca_dev->streaming)
-                setcontrast(gspca_dev);
-        return 0;
-}
-
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        if (!gspca_dev->streaming)
+                return 0;
 
-        *val = sd->contrast;
-        return 0;
-}
-
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->colors = val;
-        if (gspca_dev->streaming)
-                setcolors(gspca_dev);
-        return 0;
-}
-
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->colors;
-        return 0;
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                setcontrast(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_SATURATION:
+                setcolors(gspca_dev, ctrl->val);
+                break;
+        }
+        return gspca_dev->usb_err;
 }
 
-static int sd_set_jcomp(struct gspca_dev *gspca_dev,
-                        struct v4l2_jpegcompression *jcomp)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        if (jcomp->quality < QUALITY_MIN)
-                sd->quality = QUALITY_MIN;
-        else if (jcomp->quality > QUALITY_MAX)
-                sd->quality = QUALITY_MAX;
-        else
-                sd->quality = jcomp->quality;
-        if (gspca_dev->streaming)
-                jpeg_set_qual(sd->jpeg_hdr, sd->quality);
-        return 0;
-}
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
 
-static int sd_get_jcomp(struct gspca_dev *gspca_dev,
-                        struct v4l2_jpegcompression *jcomp)
+static int sd_init_controls(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        memset(jcomp, 0, sizeof *jcomp);
-        jcomp->quality = sd->quality;
-        jcomp->jpeg_markers = V4L2_JPEG_MARKER_DHT
-                        | V4L2_JPEG_MARKER_DQT;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 3);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 255, 1, 127);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, 63, 1, 31);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SATURATION, 0, 63, 1, 31);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
         return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
         .pkt_scan = sd_pkt_scan,
-        .get_jcomp = sd_get_jcomp,
-        .set_jcomp = sd_set_jcomp,
 };
 
 /* -- module initialisation -- */
@@ -1089,6 +983,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c
index 9c16821addd4..3b7f777785b4 100644
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -49,91 +49,6 @@ struct sd {
 #define ViewQuestM318B 6
 };
 
-/* V4L2 controls supported by the driver */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setblue_balance(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getblue_balance(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setred_balance(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getred_balance(struct gspca_dev *gspca_dev, __s32 *val);
-
-static const struct ctrl sd_ctrls[] = {
-#define MY_BRIGHTNESS 0
-        {
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-                .maximum = 127,
-                .step    = 1,
-                .default_value = 0,
-            },
-            .set = sd_setbrightness,
-            .get = sd_getbrightness,
-        },
-#define MY_CONTRAST 1
-        {
-            {
-                .id      = V4L2_CID_CONTRAST,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Contrast",
-                .minimum = 0,
-                .maximum = 64725,
-                .step    = 1,
-                .default_value = 64725,
-            },
-            .set = sd_setcontrast,
-            .get = sd_getcontrast,
-        },
-#define MY_COLOR 2
-        {
-            {
-                .id      = V4L2_CID_SATURATION,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Color",
-                .minimum = 0,
-                .maximum = 63,
-                .step    = 1,
-                .default_value = 20,
-            },
-            .set = sd_setcolors,
-            .get = sd_getcolors,
-        },
-#define MY_BLUE_BALANCE 3
-        {
-            {
-                .id      = V4L2_CID_BLUE_BALANCE,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Blue Balance",
-                .minimum = 0,
-                .maximum = 127,
-                .step    = 1,
-                .default_value = 0,
-            },
-            .set = sd_setblue_balance,
-            .get = sd_getblue_balance,
-        },
-#define MY_RED_BALANCE 4
-        {
-            {
-                .id      = V4L2_CID_RED_BALANCE,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Red Balance",
-                .minimum = 0,
-                .maximum = 127,
-                .step    = 1,
-                .default_value = 0,
-            },
-            .set = sd_setred_balance,
-            .get = sd_getred_balance,
-        },
-};
-
 static const struct v4l2_pix_format vga_mode[] = {
         {160, 120, V4L2_PIX_FMT_SPCA501, V4L2_FIELD_NONE,
                 .bytesperline = 160,
@@ -1878,42 +1793,32 @@ static int write_vector(struct gspca_dev *gspca_dev,
         return 0;
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x12, sd->brightness);
+        reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x12, val);
 }
 
-static void setcontrast(struct gspca_dev *gspca_dev)
+static void setcontrast(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
         reg_write(gspca_dev->dev, 0x00, 0x00,
-                                  (sd->contrast >> 8) & 0xff);
+                                  (val >> 8) & 0xff);
         reg_write(gspca_dev->dev, 0x00, 0x01,
-                                  sd->contrast & 0xff);
+                                  val & 0xff);
 }
 
-static void setcolors(struct gspca_dev *gspca_dev)
+static void setcolors(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x0c, sd->colors);
+        reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x0c, val);
 }
 
-static void setblue_balance(struct gspca_dev *gspca_dev)
+static void setblue_balance(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x11, sd->blue_balance);
+        reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x11, val);
 }
 
-static void setred_balance(struct gspca_dev *gspca_dev)
+static void setred_balance(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x13, sd->red_balance);
+        reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x13, val);
 }
 
 /* this function is called at probe time */
@@ -1927,9 +1832,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         cam->cam_mode = vga_mode;
         cam->nmodes = ARRAY_SIZE(vga_mode);
         sd->subtype = id->driver_info;
-        sd->brightness = sd_ctrls[MY_BRIGHTNESS].qctrl.default_value;
-        sd->contrast = sd_ctrls[MY_CONTRAST].qctrl.default_value;
-        sd->colors = sd_ctrls[MY_COLOR].qctrl.default_value;
 
         return 0;
 }
@@ -2008,13 +1910,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
         }
         reg_write(dev, SPCA501_REG_CTLRL, 0x01, 0x02);
 
-        /* HDG atleast the Intel CreateAndShare needs to have one of its
-         * brightness / contrast / color set otherwise it assumes what seems
-         * max contrast. Note that strange enough setting any of these is
-         * enough to fix the max contrast problem, to be sure we set all 3 */
-        setbrightness(gspca_dev);
-        setcontrast(gspca_dev);
-        setcolors(gspca_dev);
         return 0;
 }
 
@@ -2053,103 +1948,70 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
 }
 
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
 
-        sd->brightness = val;
-        if (gspca_dev->streaming)
-                setbrightness(gspca_dev);
-        return 0;
-}
-
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        gspca_dev->usb_err = 0;
 
-        *val = sd->brightness;
-        return 0;
-}
-
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->contrast = val;
-        if (gspca_dev->streaming)
-                setcontrast(gspca_dev);
-        return 0;
-}
-
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->contrast;
-        return 0;
-}
-
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        if (!gspca_dev->streaming)
+                return 0;
 
-        sd->colors = val;
-        if (gspca_dev->streaming)
-                setcolors(gspca_dev);
-        return 0;
-}
-
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->colors;
-        return 0;
-}
-
-static int sd_setblue_balance(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->blue_balance = val;
-        if (gspca_dev->streaming)
-                setblue_balance(gspca_dev);
-        return 0;
-}
-
-static int sd_getblue_balance(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->blue_balance;
-        return 0;
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                setcontrast(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_SATURATION:
+                setcolors(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_BLUE_BALANCE:
+                setblue_balance(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_RED_BALANCE:
+                setred_balance(gspca_dev, ctrl->val);
+                break;
+        }
+        return gspca_dev->usb_err;
 }
 
-static int sd_setred_balance(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->red_balance = val;
-        if (gspca_dev->streaming)
-                setred_balance(gspca_dev);
-        return 0;
-}
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
 
-static int sd_getred_balance(struct gspca_dev *gspca_dev, __s32 *val)
+static int sd_init_controls(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->red_balance;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 5);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 127, 1, 0);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, 64725, 1, 64725);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SATURATION, 0, 63, 1, 20);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BLUE_BALANCE, 0, 127, 1, 0);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_RED_BALANCE, 0, 127, 1, 0);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
         return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
         .stop0 = sd_stop0,
@@ -2185,6 +2047,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c
index 1320f35e39f2..bc7d67c3cb04 100644
--- a/drivers/media/video/gspca/spca505.c
+++ b/drivers/media/video/gspca/spca505.c
@@ -33,34 +33,11 @@ MODULE_LICENSE("GPL");
 struct sd {
         struct gspca_dev gspca_dev;             /* !! must be the first item */
 
-        u8 brightness;
-
         u8 subtype;
 #define IntelPCCameraPro 0
 #define Nxultra 1
 };
 
-/* V4L2 controls supported by the driver */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-
-static const struct ctrl sd_ctrls[] = {
-        {
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-#define BRIGHTNESS_DEF 127
-                .default_value = BRIGHTNESS_DEF,
-            },
-            .set = sd_setbrightness,
-            .get = sd_getbrightness,
-        },
-};
-
 static const struct v4l2_pix_format vga_mode[] = {
         {160, 120, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
                 .bytesperline = 160,
@@ -633,7 +610,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
                 cam->nmodes = ARRAY_SIZE(vga_mode);
         else                    /* no 640x480 for IntelPCCameraPro */
                 cam->nmodes = ARRAY_SIZE(vga_mode) - 1;
-        sd->brightness = BRIGHTNESS_DEF;
 
         return 0;
 }
@@ -651,11 +627,8 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 brightness)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        u8 brightness = sd->brightness;
-
         reg_write(gspca_dev->dev, 0x05, 0x00, (255 - brightness) >> 6);
         reg_write(gspca_dev->dev, 0x05, 0x01, (255 - brightness) << 2);
 }
@@ -706,13 +679,9 @@ static int sd_start(struct gspca_dev *gspca_dev)
         reg_write(dev, SPCA50X_REG_COMPRESS, 0x06, mode_tb[mode][1]);
         reg_write(dev, SPCA50X_REG_COMPRESS, 0x07, mode_tb[mode][2]);
 
-        ret = reg_write(dev, SPCA50X_REG_USB,
+        return reg_write(dev, SPCA50X_REG_USB,
                          SPCA50X_USB_CTRL,
                          SPCA50X_CUSB_ENABLE);
-
-        setbrightness(gspca_dev);
-
-        return ret;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
@@ -756,30 +725,49 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         }
 }
 
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
 
-        sd->brightness = val;
-        if (gspca_dev->streaming)
-                setbrightness(gspca_dev);
-        return 0;
+        gspca_dev->usb_err = 0;
+
+        if (!gspca_dev->streaming)
+                return 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        }
+        return gspca_dev->usb_err;
 }
 
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
+
+static int sd_init_controls(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
 
-        *val = sd->brightness;
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 5);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 255, 1, 127);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
         return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
+        .init_controls = sd_init_controls,
         .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
@@ -812,6 +800,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/video/gspca/spca506.c
index 54eed87672d2..969bb5a4cd93 100644
--- a/drivers/media/video/gspca/spca506.c
+++ b/drivers/media/video/gspca/spca506.c
@@ -33,83 +33,10 @@ MODULE_LICENSE("GPL");
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
 
-        unsigned char brightness;
-        unsigned char contrast;
-        unsigned char colors;
-        unsigned char hue;
         char norme;
         char channel;
 };
 
-/* V4L2 controls supported by the driver */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_sethue(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_gethue(struct gspca_dev *gspca_dev, __s32 *val);
-
-static const struct ctrl sd_ctrls[] = {
-#define SD_BRIGHTNESS 0
-        {
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-                .maximum = 0xff,
-                .step    = 1,
-                .default_value = 0x80,
-            },
-            .set = sd_setbrightness,
-            .get = sd_getbrightness,
-        },
-#define SD_CONTRAST 1
-        {
-            {
-                .id      = V4L2_CID_CONTRAST,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Contrast",
-                .minimum = 0,
-                .maximum = 0xff,
-                .step    = 1,
-                .default_value = 0x47,
-            },
-            .set = sd_setcontrast,
-            .get = sd_getcontrast,
-        },
-#define SD_COLOR 2
-        {
-            {
-                .id      = V4L2_CID_SATURATION,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Saturation",
-                .minimum = 0,
-                .maximum = 0xff,
-                .step    = 1,
-                .default_value = 0x40,
-            },
-            .set = sd_setcolors,
-            .get = sd_getcolors,
-        },
-#define SD_HUE 3
-        {
-            {
-                .id      = V4L2_CID_HUE,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Hue",
-                .minimum = 0,
-                .maximum = 0xff,
-                .step    = 1,
-                .default_value = 0,
-            },
-            .set = sd_sethue,
-            .get = sd_gethue,
-        },
-};
-
 static const struct v4l2_pix_format vga_mode[] = {
         {160, 120, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
                 .bytesperline = 160,
@@ -281,16 +208,11 @@ static void spca506_Setsize(struct gspca_dev *gspca_dev, __u16 code,
 static int sd_config(struct gspca_dev *gspca_dev,
                         const struct usb_device_id *id)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
 
         cam = &gspca_dev->cam;
         cam->cam_mode = vga_mode;
         cam->nmodes = ARRAY_SIZE(vga_mode);
-        sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;
-        sd->contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;
-        sd->colors = sd_ctrls[SD_COLOR].qctrl.default_value;
-        sd->hue = sd_ctrls[SD_HUE].qctrl.default_value;
         return 0;
 }
 
@@ -564,121 +486,93 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         }
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
         spca506_Initi2c(gspca_dev);
-        spca506_WriteI2c(gspca_dev, sd->brightness, SAA7113_bright);
+        spca506_WriteI2c(gspca_dev, val, SAA7113_bright);
         spca506_WriteI2c(gspca_dev, 0x01, 0x09);
 }
 
-static void setcontrast(struct gspca_dev *gspca_dev)
+static void setcontrast(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
         spca506_Initi2c(gspca_dev);
-        spca506_WriteI2c(gspca_dev, sd->contrast, SAA7113_contrast);
+        spca506_WriteI2c(gspca_dev, val, SAA7113_contrast);
         spca506_WriteI2c(gspca_dev, 0x01, 0x09);
 }
 
-static void setcolors(struct gspca_dev *gspca_dev)
+static void setcolors(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
         spca506_Initi2c(gspca_dev);
-        spca506_WriteI2c(gspca_dev, sd->colors, SAA7113_saturation);
+        spca506_WriteI2c(gspca_dev, val, SAA7113_saturation);
         spca506_WriteI2c(gspca_dev, 0x01, 0x09);
 }
 
-static void sethue(struct gspca_dev *gspca_dev)
+static void sethue(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
         spca506_Initi2c(gspca_dev);
-        spca506_WriteI2c(gspca_dev, sd->hue, SAA7113_hue);
+        spca506_WriteI2c(gspca_dev, val, SAA7113_hue);
         spca506_WriteI2c(gspca_dev, 0x01, 0x09);
 }
 
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->brightness = val;
-        if (gspca_dev->streaming)
-                setbrightness(gspca_dev);
-        return 0;
-}
-
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->brightness;
-        return 0;
-}
-
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
 
-        sd->contrast = val;
-        if (gspca_dev->streaming)
-                setcontrast(gspca_dev);
-        return 0;
-}
+        gspca_dev->usb_err = 0;
 
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        if (!gspca_dev->streaming)
+                return 0;
 
-        *val = sd->contrast;
-        return 0;
-}
-
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->colors = val;
-        if (gspca_dev->streaming)
-                setcolors(gspca_dev);
-        return 0;
-}
-
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->colors;
-        return 0;
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                setcontrast(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_SATURATION:
+                setcolors(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_HUE:
+                sethue(gspca_dev, ctrl->val);
+                break;
+        }
+        return gspca_dev->usb_err;
 }
 
-static int sd_sethue(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->hue = val;
-        if (gspca_dev->streaming)
-                sethue(gspca_dev);
-        return 0;
-}
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
 
-static int sd_gethue(struct gspca_dev *gspca_dev, __s32 *val)
+static int sd_init_controls(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->hue;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 4);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 255, 1, 128);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, 255, 1, 0x47);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SATURATION, 0, 255, 1, 0x40);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_HUE, 0, 255, 1, 0);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
         return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
         .pkt_scan = sd_pkt_scan,
@@ -711,6 +605,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c
index df4e16996461..1286b4170b88 100644
--- a/drivers/media/video/gspca/spca508.c
+++ b/drivers/media/video/gspca/spca508.c
@@ -32,8 +32,6 @@ MODULE_LICENSE("GPL");
 struct sd {
         struct gspca_dev gspca_dev;             /* !! must be the first item */
 
-        u8 brightness;
-
         u8 subtype;
 #define CreativeVista 0
 #define HamaUSBSightcam 1
@@ -43,27 +41,6 @@ struct sd {
 #define ViewQuestVQ110 5
 };
 
-/* V4L2 controls supported by the driver */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-
-static const struct ctrl sd_ctrls[] = {
-        {
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-#define BRIGHTNESS_DEF 128
-                .default_value = BRIGHTNESS_DEF,
-            },
-            .set = sd_setbrightness,
-            .get = sd_getbrightness,
-        },
-};
-
 static const struct v4l2_pix_format sif_mode[] = {
         {160, 120, V4L2_PIX_FMT_SPCA508, V4L2_FIELD_NONE,
                 .bytesperline = 160,
@@ -1411,7 +1388,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         cam->nmodes = ARRAY_SIZE(sif_mode);
 
         sd->subtype = id->driver_info;
-        sd->brightness = BRIGHTNESS_DEF;
 
         init_data = init_data_tb[sd->subtype];
         return write_vector(gspca_dev, init_data);
@@ -1471,11 +1447,8 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         }
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 brightness)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        u8 brightness = sd->brightness;
-
         /* MX seem contrast */
         reg_write(gspca_dev->dev, 0x8651, brightness);
         reg_write(gspca_dev->dev, 0x8652, brightness);
@@ -1483,31 +1456,50 @@ static void setbrightness(struct gspca_dev *gspca_dev)
         reg_write(gspca_dev->dev, 0x8654, brightness);
 }
 
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
 
-        sd->brightness = val;
-        if (gspca_dev->streaming)
-                setbrightness(gspca_dev);
-        return 0;
+        gspca_dev->usb_err = 0;
+
+        if (!gspca_dev->streaming)
+                return 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        }
+        return gspca_dev->usb_err;
 }
 
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
+
+static int sd_init_controls(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
 
-        *val = sd->brightness;
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 5);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 255, 1, 128);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
         return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
         .pkt_scan = sd_pkt_scan,
@@ -1541,6 +1533,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index 4a5f209ce719..cfe71dd6747d 100644
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -31,39 +31,17 @@ MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/SPCA561 USB Camera Driver");
 MODULE_LICENSE("GPL");
 
+#define EXPOSURE_MAX (2047 + 325)
+
 /* specific webcam descriptor */
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
 
-        __u16 exposure;                 /* rev12a only */
-#define EXPOSURE_MIN 1
-#define EXPOSURE_DEF 700                /* == 10 fps */
-#define EXPOSURE_MAX (2047 + 325)       /* see setexposure */
-
-        __u8 contrast;                  /* rev72a only */
-#define CONTRAST_MIN 0x00
-#define CONTRAST_DEF 0x20
-#define CONTRAST_MAX 0x3f
-
-        __u8 brightness;                /* rev72a only */
-#define BRIGHTNESS_MIN 0
-#define BRIGHTNESS_DEF 0x20
-#define BRIGHTNESS_MAX 0x3f
-
-        __u8 white;
-#define HUE_MIN 1
-#define HUE_DEF 0x40
-#define HUE_MAX 0x7f
-
-        __u8 autogain;
-#define AUTOGAIN_MIN 0
-#define AUTOGAIN_DEF 1
-#define AUTOGAIN_MAX 1
-
-        __u8 gain;                      /* rev12a only */
-#define GAIN_MIN 0
-#define GAIN_DEF 63
-#define GAIN_MAX 255
+        struct { /* hue/contrast control cluster */
+                struct v4l2_ctrl *contrast;
+                struct v4l2_ctrl *hue;
+        };
+        struct v4l2_ctrl *autogain;
 
 #define EXPO12A_DEF 3
         __u8 expo12a;           /* expo/gain? for rev 12a */
@@ -461,12 +439,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
                 cam->cam_mode = sif_072a_mode;
                 cam->nmodes = ARRAY_SIZE(sif_072a_mode);
         }
-        sd->brightness = BRIGHTNESS_DEF;
-        sd->contrast = CONTRAST_DEF;
-        sd->white = HUE_DEF;
-        sd->exposure = EXPOSURE_DEF;
-        sd->autogain = AUTOGAIN_DEF;
-        sd->gain = GAIN_DEF;
         sd->expo12a = EXPO12A_DEF;
         return 0;
 }
@@ -491,66 +463,49 @@ static int sd_init_72a(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-/* rev 72a only */
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct usb_device *dev = gspca_dev->dev;
-        __u8 value;
+        __u16 reg;
 
-        value = sd->brightness;
+        if (sd->chip_revision == Rev012A)
+                reg = 0x8610;
+        else
+                reg = 0x8611;
 
-        /* offsets for white balance */
-        reg_w_val(dev, 0x8611, value);          /* R */
-        reg_w_val(dev, 0x8612, value);          /* Gr */
-        reg_w_val(dev, 0x8613, value);          /* B */
-        reg_w_val(dev, 0x8614, value);          /* Gb */
+        reg_w_val(dev, reg + 0, val);           /* R */
+        reg_w_val(dev, reg + 1, val);           /* Gr */
+        reg_w_val(dev, reg + 2, val);           /* B */
+        reg_w_val(dev, reg + 3, val);           /* Gb */
 }
 
-static void setwhite(struct gspca_dev *gspca_dev)
+static void setwhite(struct gspca_dev *gspca_dev, s32 white, s32 contrast)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        __u16 white;
+        struct usb_device *dev = gspca_dev->dev;
         __u8 blue, red;
         __u16 reg;
 
         /* try to emulate MS-win as possible */
-        white = sd->white;
         red = 0x20 + white * 3 / 8;
         blue = 0x90 - white * 5 / 8;
         if (sd->chip_revision == Rev012A) {
                 reg = 0x8614;
         } else {
                 reg = 0x8651;
-                red += sd->contrast - 0x20;
-                blue += sd->contrast - 0x20;
+                red += contrast - 0x20;
+                blue += contrast - 0x20;
+                reg_w_val(dev, 0x8652, contrast + 0x20); /* Gr */
+                reg_w_val(dev, 0x8654, contrast + 0x20); /* Gb */
         }
-        reg_w_val(gspca_dev->dev, reg, red);
-        reg_w_val(gspca_dev->dev, reg + 2, blue);
-}
-
-static void setcontrast(struct gspca_dev *gspca_dev)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-        struct usb_device *dev = gspca_dev->dev;
-        __u8 value;
-
-        if (sd->chip_revision != Rev072A)
-                return;
-        value = sd->contrast + 0x20;
-
-        /* gains for white balance */
-        setwhite(gspca_dev);
-/*      reg_w_val(dev, 0x8651, value);           * R - done by setwhite */
-        reg_w_val(dev, 0x8652, value);          /* Gr */
-/*      reg_w_val(dev, 0x8653, value);           * B - done by setwhite */
-        reg_w_val(dev, 0x8654, value);          /* Gb */
+        reg_w_val(dev, reg, red);
+        reg_w_val(dev, reg + 2, blue);
 }
 
 /* rev 12a only */
-static void setexposure(struct gspca_dev *gspca_dev)
+static void setexposure(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         int i, expo = 0;
 
         /* Register 0x8309 controls exposure for the spca561,
@@ -572,8 +527,8 @@ static void setexposure(struct gspca_dev *gspca_dev)
         int table[] =  { 0, 450, 550, 625, EXPOSURE_MAX };
 
         for (i = 0; i < ARRAY_SIZE(table) - 1; i++) {
-                if (sd->exposure <= table[i + 1]) {
-                        expo  = sd->exposure - table[i];
+                if (val <= table[i + 1]) {
+                        expo  = val - table[i];
                         if (i)
                                 expo += 300;
                         expo |= i << 11;
@@ -587,29 +542,27 @@ static void setexposure(struct gspca_dev *gspca_dev)
 }
 
 /* rev 12a only */
-static void setgain(struct gspca_dev *gspca_dev)
+static void setgain(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
         /* gain reg low 6 bits  0-63 gain, bit 6 and 7, both double the
            sensitivity when set, so 31 + one of them set == 63, and 15
            with both of them set == 63 */
-        if (sd->gain < 64)
-                gspca_dev->usb_buf[0] = sd->gain;
-        else if (sd->gain < 128)
-                gspca_dev->usb_buf[0] = (sd->gain / 2) | 0x40;
+        if (val < 64)
+                gspca_dev->usb_buf[0] = val;
+        else if (val < 128)
+                gspca_dev->usb_buf[0] = (val / 2) | 0x40;
         else
-                gspca_dev->usb_buf[0] = (sd->gain / 4) | 0xc0;
+                gspca_dev->usb_buf[0] = (val / 4) | 0xc0;
 
         gspca_dev->usb_buf[1] = 0;
         reg_w_buf(gspca_dev, 0x8335, 2);
 }
 
-static void setautogain(struct gspca_dev *gspca_dev)
+static void setautogain(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        if (sd->autogain)
+        if (val)
                 sd->ag_cnt = AG_CNT_START;
         else
                 sd->ag_cnt = -1;
@@ -644,9 +597,6 @@ static int sd_start_12a(struct gspca_dev *gspca_dev)
         memcpy(gspca_dev->usb_buf, Reg8391, 8);
         reg_w_buf(gspca_dev, 0x8391, 8);
         reg_w_buf(gspca_dev, 0x8390, 8);
-        setwhite(gspca_dev);
-        setgain(gspca_dev);
-        setexposure(gspca_dev);
 
         /* Led ON (bit 3 -> 0 */
         reg_w_val(gspca_dev->dev, 0x8114, 0x00);
@@ -654,6 +604,7 @@ static int sd_start_12a(struct gspca_dev *gspca_dev)
 }
 static int sd_start_72a(struct gspca_dev *gspca_dev)
 {
+        struct sd *sd = (struct sd *) gspca_dev;
         struct usb_device *dev = gspca_dev->dev;
         int Clck;
         int mode;
@@ -683,9 +634,10 @@ static int sd_start_72a(struct gspca_dev *gspca_dev)
         reg_w_val(dev, 0x8702, 0x81);
         reg_w_val(dev, 0x8500, mode);   /* mode */
         write_sensor_72a(gspca_dev, rev72a_init_sensor2);
-        setcontrast(gspca_dev);
+        setwhite(gspca_dev, v4l2_ctrl_g_ctrl(sd->hue),
+                        v4l2_ctrl_g_ctrl(sd->contrast));
 /*      setbrightness(gspca_dev);        * fixme: bad values */
-        setautogain(gspca_dev);
+        setautogain(gspca_dev, v4l2_ctrl_g_ctrl(sd->autogain));
         reg_w_val(dev, 0x8112, 0x10 | 0x20);
         return 0;
 }
@@ -819,221 +771,96 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
 }
 
-/* rev 72a only */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
 
-        sd->brightness = val;
-        if (gspca_dev->streaming)
-                setbrightness(gspca_dev);
-        return 0;
-}
-
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->brightness;
-        return 0;
-}
-
-/* rev 72a only */
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        gspca_dev->usb_err = 0;
 
-        sd->contrast = val;
-        if (gspca_dev->streaming)
-                setcontrast(gspca_dev);
-        return 0;
-}
-
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->contrast;
-        return 0;
-}
-
-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        if (!gspca_dev->streaming)
+                return 0;
 
-        sd->autogain = val;
-        if (gspca_dev->streaming)
-                setautogain(gspca_dev);
-        return 0;
-}
-
-static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->autogain;
-        return 0;
-}
-
-static int sd_setwhite(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->white = val;
-        if (gspca_dev->streaming)
-                setwhite(gspca_dev);
-        return 0;
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                /* hue/contrast control cluster for 72a */
+                setwhite(gspca_dev, sd->hue->val, ctrl->val);
+                break;
+        case V4L2_CID_HUE:
+                /* just plain hue control for 12a */
+                setwhite(gspca_dev, ctrl->val, 0);
+                break;
+        case V4L2_CID_EXPOSURE:
+                setexposure(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_GAIN:
+                setgain(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_AUTOGAIN:
+                setautogain(gspca_dev, ctrl->val);
+                break;
+        }
+        return gspca_dev->usb_err;
 }
 
-static int sd_getwhite(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->white;
-        return 0;
-}
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
 
-/* rev12a only */
-static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_init_controls_12a(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
 
-        sd->exposure = val;
-        if (gspca_dev->streaming)
-                setexposure(gspca_dev);
-        return 0;
-}
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 3);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_HUE, 1, 0x7f, 1, 0x40);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, -128, 127, 1, 0);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_EXPOSURE, 1, EXPOSURE_MAX, 1, 700);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_GAIN, 0, 255, 1, 63);
 
-static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->exposure;
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
         return 0;
 }
 
-/* rev12a only */
-static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_init_controls_72a(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->gain = val;
-        if (gspca_dev->streaming)
-                setgain(gspca_dev);
-        return 0;
-}
+        struct sd *sd = (struct sd *)gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
 
-static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 4);
+        sd->contrast = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, 0x3f, 1, 0x20);
+        sd->hue = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_HUE, 1, 0x7f, 1, 0x40);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 0x3f, 1, 0x20);
+        sd->autogain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
 
-        *val = sd->gain;
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+        v4l2_ctrl_cluster(2, &sd->contrast);
         return 0;
 }
 
-/* control tables */
-static const struct ctrl sd_ctrls_12a[] = {
-        {
-            {
-                .id = V4L2_CID_HUE,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Hue",
-                .minimum = HUE_MIN,
-                .maximum = HUE_MAX,
-                .step = 1,
-                .default_value = HUE_DEF,
-            },
-            .set = sd_setwhite,
-            .get = sd_getwhite,
-        },
-        {
-            {
-                .id = V4L2_CID_EXPOSURE,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Exposure",
-                .minimum = EXPOSURE_MIN,
-                .maximum = EXPOSURE_MAX,
-                .step = 1,
-                .default_value = EXPOSURE_DEF,
-            },
-            .set = sd_setexposure,
-            .get = sd_getexposure,
-        },
-        {
-            {
-                .id = V4L2_CID_GAIN,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Gain",
-                .minimum = GAIN_MIN,
-                .maximum = GAIN_MAX,
-                .step = 1,
-                .default_value = GAIN_DEF,
-            },
-            .set = sd_setgain,
-            .get = sd_getgain,
-        },
-};
-
-static const struct ctrl sd_ctrls_72a[] = {
-        {
-            {
-                .id = V4L2_CID_HUE,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Hue",
-                .minimum = HUE_MIN,
-                .maximum = HUE_MAX,
-                .step = 1,
-                .default_value = HUE_DEF,
-            },
-            .set = sd_setwhite,
-            .get = sd_getwhite,
-        },
-        {
-           {
-                .id = V4L2_CID_BRIGHTNESS,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Brightness",
-                .minimum = BRIGHTNESS_MIN,
-                .maximum = BRIGHTNESS_MAX,
-                .step = 1,
-                .default_value = BRIGHTNESS_DEF,
-            },
-            .set = sd_setbrightness,
-            .get = sd_getbrightness,
-        },
-        {
-            {
-                .id = V4L2_CID_CONTRAST,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Contrast",
-                .minimum = CONTRAST_MIN,
-                .maximum = CONTRAST_MAX,
-                .step = 1,
-                .default_value = CONTRAST_DEF,
-            },
-            .set = sd_setcontrast,
-            .get = sd_getcontrast,
-        },
-        {
-            {
-                .id = V4L2_CID_AUTOGAIN,
-                .type = V4L2_CTRL_TYPE_BOOLEAN,
-                .name = "Auto Gain",
-                .minimum = AUTOGAIN_MIN,
-                .maximum = AUTOGAIN_MAX,
-                .step = 1,
-                .default_value = AUTOGAIN_DEF,
-            },
-            .set = sd_setautogain,
-            .get = sd_getautogain,
-        },
-};
-
 /* sub-driver description */
 static const struct sd_desc sd_desc_12a = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls_12a,
-        .nctrls = ARRAY_SIZE(sd_ctrls_12a),
+        .init_controls = sd_init_controls_12a,
         .config = sd_config,
         .init = sd_init_12a,
         .start = sd_start_12a,
@@ -1045,8 +872,7 @@ static const struct sd_desc sd_desc_12a = {
 };
 static const struct sd_desc sd_desc_72a = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls_72a,
-        .nctrls = ARRAY_SIZE(sd_ctrls_72a),
+        .init_controls = sd_init_controls_72a,
         .config = sd_config,
         .init = sd_init_72a,
         .start = sd_start_72a,
@@ -1103,6 +929,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/sq905.c b/drivers/media/video/gspca/sq905.c
index 04f54654a026..a8ac97931ad6 100644
--- a/drivers/media/video/gspca/sq905.c
+++ b/drivers/media/video/gspca/sq905.c
@@ -433,6 +433,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume  = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/sq905c.c b/drivers/media/video/gspca/sq905c.c
index f34ddb0570c8..2c2f3d2f357f 100644
--- a/drivers/media/video/gspca/sq905c.c
+++ b/drivers/media/video/gspca/sq905c.c
@@ -340,6 +340,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume  = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/sq930x.c b/drivers/media/video/gspca/sq930x.c
index 1a8ba9b3550a..3e1e486af883 100644
--- a/drivers/media/video/gspca/sq930x.c
+++ b/drivers/media/video/gspca/sq930x.c
@@ -36,8 +36,10 @@ MODULE_LICENSE("GPL");
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
 
-        u16 expo;
-        u8 gain;
+        struct { /* exposure/gain control cluster */
+                struct v4l2_ctrl *exposure;
+                struct v4l2_ctrl *gain;
+        };
 
         u8 do_ctrl;
         u8 gpio[2];
@@ -55,42 +57,6 @@ enum sensors {
         SENSOR_OV9630,
 };
 
-static int sd_setexpo(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getexpo(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val);
-
-static const struct ctrl sd_ctrls[] = {
-        {
-            {
-                .id = V4L2_CID_EXPOSURE,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Exposure",
-                .minimum = 0x0001,
-                .maximum = 0x0fff,
-                .step = 1,
-#define EXPO_DEF 0x0356
-                .default_value = EXPO_DEF,
-            },
-            .set = sd_setexpo,
-            .get = sd_getexpo,
-        },
-        {
-            {
-                .id = V4L2_CID_GAIN,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Gain",
-                .minimum = 0x01,
-                .maximum = 0xff,
-                .step = 1,
-#define GAIN_DEF 0x8d
-                .default_value = GAIN_DEF,
-            },
-            .set = sd_setgain,
-            .get = sd_getgain,
-        },
-};
-
 static struct v4l2_pix_format vga_mode[] = {
         {320, 240, V4L2_PIX_FMT_SRGGB8, V4L2_FIELD_NONE,
                 .bytesperline = 320,
@@ -791,7 +757,7 @@ static void lz24bp_ppl(struct sd *sd, u16 ppl)
         ucbus_write(&sd->gspca_dev, cmds, ARRAY_SIZE(cmds), 2);
 }
 
-static void setexposure(struct gspca_dev *gspca_dev)
+static void setexposure(struct gspca_dev *gspca_dev, s32 expo, s32 gain)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         int i, integclks, intstartclk, frameclks, min_frclk;
@@ -799,7 +765,7 @@ static void setexposure(struct gspca_dev *gspca_dev)
         u16 cmd;
         u8 buf[15];
 
-        integclks = sd->expo;
+        integclks = expo;
         i = 0;
         cmd = SQ930_CTRL_SET_EXPOSURE;
 
@@ -818,7 +784,7 @@ static void setexposure(struct gspca_dev *gspca_dev)
                 buf[i++] = intstartclk;
                 buf[i++] = frameclks >> 8;
                 buf[i++] = frameclks;
-                buf[i++] = sd->gain;
+                buf[i++] = gain;
                 break;
         default:                                /* cmos */
 /*      case SENSOR_MI0360: */
@@ -834,7 +800,7 @@ static void setexposure(struct gspca_dev *gspca_dev)
                 buf[i++] = 0x35;        /* reg = global gain */
                 buf[i++] = 0x00;        /* val H */
                 buf[i++] = sensor->i2c_dum;
-                buf[i++] = 0x80 + sd->gain / 2; /* val L */
+                buf[i++] = 0x80 + gain / 2; /* val L */
                 buf[i++] = 0x00;
                 buf[i++] = 0x00;
                 buf[i++] = 0x00;
@@ -860,9 +826,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
 
         cam->bulk = 1;
 
-        sd->gain = GAIN_DEF;
-        sd->expo = EXPO_DEF;
-
         return 0;
 }
 
@@ -1089,7 +1052,8 @@ static void sd_dq_callback(struct gspca_dev *gspca_dev)
                 return;
         sd->do_ctrl = 0;
 
-        setexposure(gspca_dev);
+        setexposure(gspca_dev, v4l2_ctrl_g_ctrl(sd->exposure),
+                        v4l2_ctrl_g_ctrl(sd->gain));
 
         gspca_dev->cam.bulk_nurbs = 1;
         ret = usb_submit_urb(gspca_dev->urb[0], GFP_ATOMIC);
@@ -1113,48 +1077,55 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0);
 }
 
-static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
         struct sd *sd = (struct sd *) gspca_dev;
 
-        sd->gain = val;
-        if (gspca_dev->streaming)
-                sd->do_ctrl = 1;
-        return 0;
-}
+        gspca_dev->usb_err = 0;
 
-static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        if (!gspca_dev->streaming)
+                return 0;
 
-        *val = sd->gain;
-        return 0;
+        switch (ctrl->id) {
+        case V4L2_CID_EXPOSURE:
+                setexposure(gspca_dev, ctrl->val, sd->gain->val);
+                break;
+        }
+        return gspca_dev->usb_err;
 }
-static int sd_setexpo(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
 
-        sd->expo = val;
-        if (gspca_dev->streaming)
-                sd->do_ctrl = 1;
-        return 0;
-}
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
 
-static int sd_getexpo(struct gspca_dev *gspca_dev, __s32 *val)
+static int sd_init_controls(struct gspca_dev *gspca_dev)
 {
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
         struct sd *sd = (struct sd *) gspca_dev;
 
-        *val = sd->expo;
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 2);
+        sd->exposure = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_EXPOSURE, 1, 0xfff, 1, 0x356);
+        sd->gain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_GAIN, 1, 255, 1, 0x8d);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+        v4l2_ctrl_cluster(2, &sd->exposure);
         return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name   = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init   = sd_init,
+        .init_controls = sd_init_controls,
         .isoc_init = sd_isoc_init,
         .start  = sd_start,
         .stopN  = sd_stopN,
@@ -1194,6 +1165,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend    = gspca_suspend,
         .resume     = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c
index 4ae7cc8f463a..8c0982607f25 100644
--- a/drivers/media/video/gspca/stk014.c
+++ b/drivers/media/video/gspca/stk014.c
@@ -29,86 +29,14 @@ MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>");
 MODULE_DESCRIPTION("Syntek DV4000 (STK014) USB Camera Driver");
 MODULE_LICENSE("GPL");
 
-/* controls */
-enum e_ctrl {
-        BRIGHTNESS,
-        CONTRAST,
-        COLORS,
-        LIGHTFREQ,
-        NCTRLS          /* number of controls */
-};
+#define QUALITY 50
 
 /* specific webcam descriptor */
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
-
-        struct gspca_ctrl ctrls[NCTRLS];
-
-        u8 quality;
-#define QUALITY_MIN 70
-#define QUALITY_MAX 95
-#define QUALITY_DEF 88
-
         u8 jpeg_hdr[JPEG_HDR_SZ];
 };
 
-/* V4L2 controls supported by the driver */
-static void setbrightness(struct gspca_dev *gspca_dev);
-static void setcontrast(struct gspca_dev *gspca_dev);
-static void setcolors(struct gspca_dev *gspca_dev);
-static void setlightfreq(struct gspca_dev *gspca_dev);
-
-static const struct ctrl sd_ctrls[NCTRLS] = {
-[BRIGHTNESS] = {
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-                .default_value = 127,
-            },
-            .set_control = setbrightness
-        },
-[CONTRAST] = {
-            {
-                .id      = V4L2_CID_CONTRAST,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Contrast",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-                .default_value = 127,
-            },
-            .set_control = setcontrast
-        },
-[COLORS] = {
-            {
-                .id      = V4L2_CID_SATURATION,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Color",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-                .default_value = 127,
-            },
-            .set_control = setcolors
-        },
-[LIGHTFREQ] = {
-            {
-                .id      = V4L2_CID_POWER_LINE_FREQUENCY,
-                .type    = V4L2_CTRL_TYPE_MENU,
-                .name    = "Light frequency filter",
-                .minimum = 1,
-                .maximum = 2,   /* 0: 0, 1: 50Hz, 2:60Hz */
-                .step    = 1,
-                .default_value = 1,
-            },
-            .set_control = setlightfreq
-        },
-};
-
 static const struct v4l2_pix_format vga_mode[] = {
         {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 320,
@@ -255,41 +183,36 @@ static void set_par(struct gspca_dev *gspca_dev,
         snd_val(gspca_dev, 0x003f08, parval);
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         int parval;
 
         parval = 0x06000000             /* whiteness */
-                + (sd->ctrls[BRIGHTNESS].val << 16);
+                + (val << 16);
         set_par(gspca_dev, parval);
 }
 
-static void setcontrast(struct gspca_dev *gspca_dev)
+static void setcontrast(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         int parval;
 
         parval = 0x07000000             /* contrast */
-                + (sd->ctrls[CONTRAST].val << 16);
+                + (val << 16);
         set_par(gspca_dev, parval);
 }
 
-static void setcolors(struct gspca_dev *gspca_dev)
+static void setcolors(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         int parval;
 
         parval = 0x08000000             /* saturation */
-                + (sd->ctrls[COLORS].val << 16);
+                + (val << 16);
         set_par(gspca_dev, parval);
 }
 
-static void setlightfreq(struct gspca_dev *gspca_dev)
+static void setlightfreq(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        set_par(gspca_dev, sd->ctrls[LIGHTFREQ].val == 1
+        set_par(gspca_dev, val == 1
                         ? 0x33640000            /* 50 Hz */
                         : 0x33780000);          /* 60 Hz */
 }
@@ -298,12 +221,8 @@ static void setlightfreq(struct gspca_dev *gspca_dev)
 static int sd_config(struct gspca_dev *gspca_dev,
                         const struct usb_device_id *id)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
         gspca_dev->cam.cam_mode = vga_mode;
         gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode);
-        gspca_dev->cam.ctrls = sd->ctrls;
-        sd->quality = QUALITY_DEF;
         return 0;
 }
 
@@ -333,7 +252,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
         /* create the JPEG header */
         jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width,
                         0x22);          /* JPEG 411 */
-        jpeg_set_qual(sd->jpeg_hdr, sd->quality);
+        jpeg_set_qual(sd->jpeg_hdr, QUALITY);
 
         /* work on alternate 1 */
         usb_set_interface(gspca_dev->dev, gspca_dev->iface, 1);
@@ -365,14 +284,10 @@ static int sd_start(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, 0x0640, 0);
         reg_w(gspca_dev, 0x0650, 0);
         reg_w(gspca_dev, 0x0660, 0);
-        setbrightness(gspca_dev);               /* whiteness */
-        setcontrast(gspca_dev);                 /* contrast */
-        setcolors(gspca_dev);                   /* saturation */
         set_par(gspca_dev, 0x09800000);         /* Red ? */
         set_par(gspca_dev, 0x0a800000);         /* Green ? */
         set_par(gspca_dev, 0x0b800000);         /* Blue ? */
         set_par(gspca_dev, 0x0d030000);         /* Gamma ? */
-        setlightfreq(gspca_dev);
 
         /* start the video flow */
         set_par(gspca_dev, 0x01000000);
@@ -435,62 +350,70 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
 }
 
-static int sd_querymenu(struct gspca_dev *gspca_dev,
-                        struct v4l2_querymenu *menu)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        static const char *freq_nm[3] = {"NoFliker", "50 Hz", "60 Hz"};
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
 
-        switch (menu->id) {
-        case V4L2_CID_POWER_LINE_FREQUENCY:
-                if ((unsigned) menu->index >= ARRAY_SIZE(freq_nm))
-                        break;
-                strcpy((char *) menu->name, freq_nm[menu->index]);
-                return 0;
-        }
-        return -EINVAL;
-}
+        gspca_dev->usb_err = 0;
 
-static int sd_set_jcomp(struct gspca_dev *gspca_dev,
-                        struct v4l2_jpegcompression *jcomp)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        if (!gspca_dev->streaming)
+                return 0;
 
-        if (jcomp->quality < QUALITY_MIN)
-                sd->quality = QUALITY_MIN;
-        else if (jcomp->quality > QUALITY_MAX)
-                sd->quality = QUALITY_MAX;
-        else
-                sd->quality = jcomp->quality;
-        if (gspca_dev->streaming)
-                jpeg_set_qual(sd->jpeg_hdr, sd->quality);
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                setcontrast(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_SATURATION:
+                setcolors(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_POWER_LINE_FREQUENCY:
+                setlightfreq(gspca_dev, ctrl->val);
+                break;
+        }
         return gspca_dev->usb_err;
 }
 
-static int sd_get_jcomp(struct gspca_dev *gspca_dev,
-                        struct v4l2_jpegcompression *jcomp)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
 
-        memset(jcomp, 0, sizeof *jcomp);
-        jcomp->quality = sd->quality;
-        jcomp->jpeg_markers = V4L2_JPEG_MARKER_DHT
-                        | V4L2_JPEG_MARKER_DQT;
+static int sd_init_controls(struct gspca_dev *gspca_dev)
+{
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 4);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 255, 1, 127);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, 255, 1, 127);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SATURATION, 0, 255, 1, 127);
+        v4l2_ctrl_new_std_menu(hdl, &sd_ctrl_ops,
+                        V4L2_CID_POWER_LINE_FREQUENCY,
+                        V4L2_CID_POWER_LINE_FREQUENCY_60HZ, 1,
+                        V4L2_CID_POWER_LINE_FREQUENCY_50HZ);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
         return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = NCTRLS,
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
         .pkt_scan = sd_pkt_scan,
-        .querymenu = sd_querymenu,
-        .get_jcomp = sd_get_jcomp,
-        .set_jcomp = sd_set_jcomp,
 };
 
 /* -- module initialisation -- */
@@ -516,6 +439,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/stv0680.c b/drivers/media/video/gspca/stv0680.c
index 461ed645f309..67605272aaa8 100644
--- a/drivers/media/video/gspca/stv0680.c
+++ b/drivers/media/video/gspca/stv0680.c
@@ -46,10 +46,6 @@ struct sd {
         u8 current_mode;
 };
 
-/* V4L2 controls supported by the driver */
-static const struct ctrl sd_ctrls[] = {
-};
-
 static int stv_sndctrl(struct gspca_dev *gspca_dev, int set, u8 req, u16 val,
                        int size)
 {
@@ -318,8 +314,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
         .start = sd_start,
@@ -352,6 +346,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index c80f0c0c75b6..9ccfcb1c6479 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -30,18 +30,13 @@ MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/SPCA5xx USB Camera Driver");
 MODULE_LICENSE("GPL");
 
+#define QUALITY 85
+
 /* specific webcam descriptor */
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
 
-        s8 brightness;
-        u8 contrast;
-        u8 colors;
-        u8 autogain;
-        u8 quality;
-#define QUALITY_MIN 70
-#define QUALITY_MAX 95
-#define QUALITY_DEF 85
+        bool autogain;
 
         u8 bridge;
 #define BRIDGE_SPCA504 0
@@ -59,75 +54,6 @@ struct sd {
         u8 jpeg_hdr[JPEG_HDR_SZ];
 };
 
-/* V4L2 controls supported by the driver */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val);
-
-static const struct ctrl sd_ctrls[] = {
-        {
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = -128,
-                .maximum = 127,
-                .step    = 1,
-#define BRIGHTNESS_DEF 0
-                .default_value = BRIGHTNESS_DEF,
-            },
-            .set = sd_setbrightness,
-            .get = sd_getbrightness,
-        },
-        {
-            {
-                .id      = V4L2_CID_CONTRAST,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Contrast",
-                .minimum = 0,
-                .maximum = 0xff,
-                .step    = 1,
-#define CONTRAST_DEF 0x20
-                .default_value = CONTRAST_DEF,
-            },
-            .set = sd_setcontrast,
-            .get = sd_getcontrast,
-        },
-        {
-            {
-                .id      = V4L2_CID_SATURATION,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Color",
-                .minimum = 0,
-                .maximum = 0xff,
-                .step    = 1,
-#define COLOR_DEF 0x1a
-                .default_value = COLOR_DEF,
-            },
-            .set = sd_setcolors,
-            .get = sd_getcolors,
-        },
-        {
-            {
-                .id      = V4L2_CID_AUTOGAIN,
-                .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                .name    = "Auto Gain",
-                .minimum = 0,
-                .maximum = 1,
-                .step    = 1,
-#define AUTOGAIN_DEF 1
-                .default_value = AUTOGAIN_DEF,
-            },
-            .set = sd_setautogain,
-            .get = sd_getautogain,
-        },
-};
-
 static const struct v4l2_pix_format vga_mode[] = {
         {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 320,
@@ -597,31 +523,31 @@ static void spca504B_setQtable(struct gspca_dev *gspca_dev)
         spca504B_PollingDataReady(gspca_dev);
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u16 reg;
 
         reg = sd->bridge == BRIDGE_SPCA536 ? 0x20f0 : 0x21a7;
-        reg_w_riv(gspca_dev, 0x00, reg, sd->brightness);
+        reg_w_riv(gspca_dev, 0x00, reg, val);
 }
 
-static void setcontrast(struct gspca_dev *gspca_dev)
+static void setcontrast(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u16 reg;
 
         reg = sd->bridge == BRIDGE_SPCA536 ? 0x20f1 : 0x21a8;
-        reg_w_riv(gspca_dev, 0x00, reg, sd->contrast);
+        reg_w_riv(gspca_dev, 0x00, reg, val);
 }
 
-static void setcolors(struct gspca_dev *gspca_dev)
+static void setcolors(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u16 reg;
 
         reg = sd->bridge == BRIDGE_SPCA536 ? 0x20f6 : 0x21ae;
-        reg_w_riv(gspca_dev, 0x00, reg, sd->colors);
+        reg_w_riv(gspca_dev, 0x00, reg, val);
 }
 
 static void init_ctl_reg(struct gspca_dev *gspca_dev)
@@ -629,10 +555,6 @@ static void init_ctl_reg(struct gspca_dev *gspca_dev)
         struct sd *sd = (struct sd *) gspca_dev;
         int pollreg = 1;
 
-        setbrightness(gspca_dev);
-        setcontrast(gspca_dev);
-        setcolors(gspca_dev);
-
         switch (sd->bridge) {
         case BRIDGE_SPCA504:
         case BRIDGE_SPCA504C:
@@ -704,11 +626,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
                 cam->nmodes = ARRAY_SIZE(vga_mode2);
                 break;
         }
-        sd->brightness = BRIGHTNESS_DEF;
-        sd->contrast = CONTRAST_DEF;
-        sd->colors = COLOR_DEF;
-        sd->autogain = AUTOGAIN_DEF;
-        sd->quality = QUALITY_DEF;
         return 0;
 }
 
@@ -807,7 +724,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
         /* create the JPEG header */
         jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width,
                         0x22);          /* JPEG 411 */
-        jpeg_set_qual(sd->jpeg_hdr, sd->quality);
+        jpeg_set_qual(sd->jpeg_hdr, QUALITY);
 
         if (sd->bridge == BRIDGE_SPCA504B)
                 spca504B_setQtable(gspca_dev);
@@ -1012,116 +929,69 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
 }
 
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->brightness = val;
-        if (gspca_dev->streaming)
-                setbrightness(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->brightness;
-        return 0;
-}
-
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
 
-        sd->contrast = val;
-        if (gspca_dev->streaming)
-                setcontrast(gspca_dev);
-        return gspca_dev->usb_err;
-}
+        gspca_dev->usb_err = 0;
 
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        if (!gspca_dev->streaming)
+                return 0;
 
-        *val = sd->contrast;
-        return 0;
-}
-
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->colors = val;
-        if (gspca_dev->streaming)
-                setcolors(gspca_dev);
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                setcontrast(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_SATURATION:
+                setcolors(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_AUTOGAIN:
+                sd->autogain = ctrl->val;
+                break;
+        }
         return gspca_dev->usb_err;
 }
 
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->colors;
-        return 0;
-}
-
-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->autogain = val;
-        return 0;
-}
-
-static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->autogain;
-        return 0;
-}
-
-static int sd_set_jcomp(struct gspca_dev *gspca_dev,
-                        struct v4l2_jpegcompression *jcomp)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        if (jcomp->quality < QUALITY_MIN)
-                sd->quality = QUALITY_MIN;
-        else if (jcomp->quality > QUALITY_MAX)
-                sd->quality = QUALITY_MAX;
-        else
-                sd->quality = jcomp->quality;
-        if (gspca_dev->streaming)
-                jpeg_set_qual(sd->jpeg_hdr, sd->quality);
-        return gspca_dev->usb_err;
-}
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
 
-static int sd_get_jcomp(struct gspca_dev *gspca_dev,
-                        struct v4l2_jpegcompression *jcomp)
+static int sd_init_controls(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        memset(jcomp, 0, sizeof *jcomp);
-        jcomp->quality = sd->quality;
-        jcomp->jpeg_markers = V4L2_JPEG_MARKER_DHT
-                        | V4L2_JPEG_MARKER_DQT;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 4);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, -128, 127, 1, 0);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, 255, 1, 0x20);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SATURATION, 0, 255, 1, 0x1a);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
         return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
         .pkt_scan = sd_pkt_scan,
-        .get_jcomp = sd_get_jcomp,
-        .set_jcomp = sd_set_jcomp,
 };
 
 /* -- module initialisation -- */
@@ -1208,6 +1078,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c
index 9b9f85a8e60e..8bc6c3ceec2c 100644
--- a/drivers/media/video/gspca/t613.c
+++ b/drivers/media/video/gspca/t613.c
@@ -34,28 +34,19 @@
 #include <linux/slab.h>
 #include "gspca.h"
 
-#define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 0)
-
 MODULE_AUTHOR("Leandro Costantino <le_costantino@pixartargentina.com.ar>");
 MODULE_DESCRIPTION("GSPCA/T613 (JPEG Compliance) USB Camera Driver");
 MODULE_LICENSE("GPL");
 
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
-
-        u8 brightness;
-        u8 contrast;
-        u8 colors;
-        u8 autogain;
-        u8 gamma;
-        u8 sharpness;
-        u8 freq;
-        u8 red_gain;
-        u8 blue_gain;
-        u8 green_gain;
-        u8 awb; /* set default r/g/b and activate */
-        u8 mirror;
-        u8 effect;
+        struct v4l2_ctrl *freq;
+        struct { /* awb / color gains control cluster */
+                struct v4l2_ctrl *awb;
+                struct v4l2_ctrl *gain;
+                struct v4l2_ctrl *red_balance;
+                struct v4l2_ctrl *blue_balance;
+        };
 
         u8 sensor;
         u8 button_pressed;
@@ -67,245 +58,31 @@ enum sensors {
         SENSOR_LT168G,          /* must verify if this is the actual model */
 };
 
-/* V4L2 controls supported by the driver */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setlowlight(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getlowlight(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setgamma(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getgamma(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setfreq(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val);
-
-static int sd_setawb(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getawb(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setblue_gain(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getblue_gain(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setred_gain(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getred_gain(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val);
-
-static int sd_setmirror(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getmirror(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_seteffect(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_geteffect(struct gspca_dev *gspca_dev, __s32 *val);
-
-static const struct ctrl sd_ctrls[] = {
-        {
-         {
-          .id = V4L2_CID_BRIGHTNESS,
-          .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Brightness",
-          .minimum = 0,
-          .maximum = 14,
-          .step = 1,
-#define BRIGHTNESS_DEF 8
-          .default_value = BRIGHTNESS_DEF,
-          },
-         .set = sd_setbrightness,
-         .get = sd_getbrightness,
-         },
-        {
-         {
-          .id = V4L2_CID_CONTRAST,
-          .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Contrast",
-          .minimum = 0,
-          .maximum = 0x0d,
-          .step = 1,
-#define CONTRAST_DEF 0x07
-          .default_value = CONTRAST_DEF,
-          },
-         .set = sd_setcontrast,
-         .get = sd_getcontrast,
-         },
-        {
-         {
-          .id = V4L2_CID_SATURATION,
-          .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Color",
-          .minimum = 0,
-          .maximum = 0x0f,
-          .step = 1,
-#define COLORS_DEF 0x05
-          .default_value = COLORS_DEF,
-          },
-         .set = sd_setcolors,
-         .get = sd_getcolors,
-         },
-#define GAMMA_MAX 16
-#define GAMMA_DEF 10
-        {
-         {
-          .id = V4L2_CID_GAMMA, /* (gamma on win) */
-          .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Gamma",
-          .minimum = 0,
-          .maximum = GAMMA_MAX - 1,
-          .step = 1,
-          .default_value = GAMMA_DEF,
-          },
-         .set = sd_setgamma,
-         .get = sd_getgamma,
-         },
-        {
-         {
-          .id = V4L2_CID_BACKLIGHT_COMPENSATION, /* Activa lowlight,
-                                 * some apps dont bring up the
-                                 * backligth_compensation control) */
-          .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Low Light",
-          .minimum = 0,
-          .maximum = 1,
-          .step = 1,
-#define AUTOGAIN_DEF 0x01
-          .default_value = AUTOGAIN_DEF,
-          },
-         .set = sd_setlowlight,
-         .get = sd_getlowlight,
-         },
-        {
-         {
-          .id = V4L2_CID_HFLIP,
-          .type = V4L2_CTRL_TYPE_BOOLEAN,
-          .name = "Mirror Image",
-          .minimum = 0,
-          .maximum = 1,
-          .step = 1,
-#define MIRROR_DEF 0
-          .default_value = MIRROR_DEF,
-          },
-         .set = sd_setmirror,
-         .get = sd_getmirror
-        },
-        {
-         {
-          .id = V4L2_CID_POWER_LINE_FREQUENCY,
-          .type = V4L2_CTRL_TYPE_MENU,
-          .name = "Light Frequency Filter",
-          .minimum = 1,         /* 1 -> 0x50, 2->0x60 */
-          .maximum = 2,
-          .step = 1,
-#define FREQ_DEF 1
-          .default_value = FREQ_DEF,
-          },
-         .set = sd_setfreq,
-         .get = sd_getfreq},
-
-        {
-         {
-          .id =  V4L2_CID_AUTO_WHITE_BALANCE,
-          .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Auto White Balance",
-          .minimum = 0,
-          .maximum = 1,
-          .step = 1,
-#define AWB_DEF 0
-          .default_value = AWB_DEF,
-          },
-         .set = sd_setawb,
-         .get = sd_getawb
-        },
-        {
-         {
-          .id = V4L2_CID_SHARPNESS,
-          .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Sharpness",
-          .minimum = 0,
-          .maximum = 15,
-          .step = 1,
-#define SHARPNESS_DEF 0x06
-          .default_value = SHARPNESS_DEF,
-          },
-         .set = sd_setsharpness,
-         .get = sd_getsharpness,
-         },
-        {
-         {
-          .id = V4L2_CID_EFFECTS,
-          .type = V4L2_CTRL_TYPE_MENU,
-          .name = "Webcam Effects",
-          .minimum = 0,
-          .maximum = 4,
-          .step = 1,
-#define EFFECTS_DEF 0
-          .default_value = EFFECTS_DEF,
-          },
-         .set = sd_seteffect,
-         .get = sd_geteffect
-        },
-        {
-         {
-            .id      = V4L2_CID_BLUE_BALANCE,
-            .type    = V4L2_CTRL_TYPE_INTEGER,
-            .name    = "Blue Balance",
-            .minimum = 0x10,
-            .maximum = 0x40,
-            .step    = 1,
-#define BLUE_GAIN_DEF 0x20
-            .default_value = BLUE_GAIN_DEF,
-         },
-        .set = sd_setblue_gain,
-        .get = sd_getblue_gain,
-        },
-        {
-         {
-            .id      = V4L2_CID_RED_BALANCE,
-            .type    = V4L2_CTRL_TYPE_INTEGER,
-            .name    = "Red Balance",
-            .minimum = 0x10,
-            .maximum = 0x40,
-            .step    = 1,
-#define RED_GAIN_DEF 0x20
-            .default_value = RED_GAIN_DEF,
-         },
-        .set = sd_setred_gain,
-        .get = sd_getred_gain,
-        },
-        {
-         {
-            .id      = V4L2_CID_GAIN,
-            .type    = V4L2_CTRL_TYPE_INTEGER,
-            .name    = "Gain",
-            .minimum = 0x10,
-            .maximum = 0x40,
-            .step    = 1,
-#define GAIN_DEF  0x20
-            .default_value = GAIN_DEF,
-         },
-        .set = sd_setgain,
-        .get = sd_getgain,
-        },
-};
-
 static const struct v4l2_pix_format vga_mode_t16[] = {
         {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 160,
                 .sizeimage = 160 * 120 * 4 / 8 + 590,
                 .colorspace = V4L2_COLORSPACE_JPEG,
                 .priv = 4},
+#if 0 /* HDG: broken with my test cam, so lets disable it */
         {176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 176,
                 .sizeimage = 176 * 144 * 3 / 8 + 590,
                 .colorspace = V4L2_COLORSPACE_JPEG,
                 .priv = 3},
+#endif
         {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 320,
                 .sizeimage = 320 * 240 * 3 / 8 + 590,
                 .colorspace = V4L2_COLORSPACE_JPEG,
                 .priv = 2},
+#if 0 /* HDG: broken with my test cam, so lets disable it */
         {352, 288, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 352,
                 .sizeimage = 352 * 288 * 3 / 8 + 590,
                 .colorspace = V4L2_COLORSPACE_JPEG,
                 .priv = 1},
+#endif
         {640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 640,
                 .sizeimage = 640 * 480 * 3 / 8 + 590,
@@ -454,17 +231,6 @@ static const struct additional_sensor_data sensor_data[] = {
 };
 
 #define MAX_EFFECTS 7
-/* easily done by soft, this table could be removed,
- * i keep it here just in case */
-static char *effects_control[MAX_EFFECTS] = {
-        "Normal",
-        "Emboss",               /* disabled */
-        "Monochrome",
-        "Sepia",
-        "Sketch",
-        "Sun Effect",           /* disabled */
-        "Negative",
-};
 static const u8 effects_table[MAX_EFFECTS][6] = {
         {0xa8, 0xe8, 0xc6, 0xd2, 0xc0, 0x00},   /* Normal */
         {0xa8, 0xc8, 0xc6, 0x52, 0xc0, 0x04},   /* Repujar */
@@ -475,7 +241,8 @@ static const u8 effects_table[MAX_EFFECTS][6] = {
         {0xa8, 0xc8, 0xc6, 0xd2, 0xc0, 0x40},   /* Negative */
 };
 
-static const u8 gamma_table[GAMMA_MAX][17] = {
+#define GAMMA_MAX (15)
+static const u8 gamma_table[GAMMA_MAX+1][17] = {
 /* gamma table from cam1690.ini */
         {0x00, 0x00, 0x01, 0x04, 0x08, 0x0e, 0x16, 0x21,        /* 0 */
          0x2e, 0x3d, 0x50, 0x65, 0x7d, 0x99, 0xb8, 0xdb,
@@ -683,38 +450,18 @@ static void om6802_sensor_init(struct gspca_dev *gspca_dev)
 static int sd_config(struct gspca_dev *gspca_dev,
                      const struct usb_device_id *id)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        struct cam *cam;
-
-        cam = &gspca_dev->cam;
+        struct cam *cam  = &gspca_dev->cam;
 
         cam->cam_mode = vga_mode_t16;
         cam->nmodes = ARRAY_SIZE(vga_mode_t16);
 
-        sd->brightness = BRIGHTNESS_DEF;
-        sd->contrast = CONTRAST_DEF;
-        sd->colors = COLORS_DEF;
-        sd->gamma = GAMMA_DEF;
-        sd->autogain = AUTOGAIN_DEF;
-        sd->mirror = MIRROR_DEF;
-        sd->freq = FREQ_DEF;
-        sd->awb = AWB_DEF;
-        sd->sharpness = SHARPNESS_DEF;
-        sd->effect = EFFECTS_DEF;
-        sd->red_gain = RED_GAIN_DEF;
-        sd->blue_gain = BLUE_GAIN_DEF;
-        sd->green_gain = GAIN_DEF * 3 - RED_GAIN_DEF - BLUE_GAIN_DEF;
-
         return 0;
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 brightness)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        unsigned int brightness;
         u8 set6[4] = { 0x8f, 0x24, 0xc3, 0x00 };
 
-        brightness = sd->brightness;
         if (brightness < 7) {
                 set6[1] = 0x26;
                 set6[3] = 0x70 - brightness * 0x10;
@@ -725,10 +472,8 @@ static void setbrightness(struct gspca_dev *gspca_dev)
         reg_w_buf(gspca_dev, set6, sizeof set6);
 }
 
-static void setcontrast(struct gspca_dev *gspca_dev)
+static void setcontrast(struct gspca_dev *gspca_dev, s32 contrast)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        unsigned int contrast = sd->contrast;
         u16 reg_to_write;
 
         if (contrast < 7)
@@ -739,89 +484,62 @@ static void setcontrast(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, reg_to_write);
 }
 
-static void setcolors(struct gspca_dev *gspca_dev)
+static void setcolors(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u16 reg_to_write;
 
-        reg_to_write = 0x80bb + sd->colors * 0x100;     /* was 0xc0 */
+        reg_to_write = 0x80bb + val * 0x100;    /* was 0xc0 */
         reg_w(gspca_dev, reg_to_write);
 }
 
-static void setgamma(struct gspca_dev *gspca_dev)
+static void setgamma(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
         PDEBUG(D_CONF, "Gamma: %d", sd->gamma);
         reg_w_ixbuf(gspca_dev, 0x90,
-                gamma_table[sd->gamma], sizeof gamma_table[0]);
+                gamma_table[val], sizeof gamma_table[0]);
 }
 
-static void setRGB(struct gspca_dev *gspca_dev)
+static void setawb_n_RGB(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        u8 all_gain_reg[6] =
-                {0x87, 0x00, 0x88, 0x00, 0x89, 0x00};
+        u8 all_gain_reg[8] = {
+                0x87, 0x00, 0x88, 0x00, 0x89, 0x00, 0x80, 0x00 };
+        s32 red_gain, blue_gain, green_gain;
+
+        green_gain = sd->gain->val;
+
+        red_gain = green_gain + sd->red_balance->val;
+        if (red_gain > 0x40)
+                red_gain = 0x40;
+        else if (red_gain < 0x10)
+                red_gain = 0x10;
+
+        blue_gain = green_gain + sd->blue_balance->val;
+        if (blue_gain > 0x40)
+                blue_gain = 0x40;
+        else if (blue_gain < 0x10)
+                blue_gain = 0x10;
+
+        all_gain_reg[1] = red_gain;
+        all_gain_reg[3] = blue_gain;
+        all_gain_reg[5] = green_gain;
+        all_gain_reg[7] = sensor_data[sd->sensor].reg80;
+        if (!sd->awb->val)
+                all_gain_reg[7] &= ~0x04; /* AWB off */
 
-        all_gain_reg[1] = sd->red_gain;
-        all_gain_reg[3] = sd->blue_gain;
-        all_gain_reg[5] = sd->green_gain;
         reg_w_buf(gspca_dev, all_gain_reg, sizeof all_gain_reg);
 }
 
-/* Generic fnc for r/b balance, exposure and awb */
-static void setawb(struct gspca_dev *gspca_dev)
+static void setsharpness(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        u16 reg80;
-
-        reg80 = (sensor_data[sd->sensor].reg80 << 8) | 0x80;
-
-        /* on awb leave defaults values */
-        if (!sd->awb) {
-                /* shoud we wait here.. */
-                /* update and reset RGB gains with webcam values */
-                sd->red_gain = reg_r(gspca_dev, 0x0087);
-                sd->blue_gain = reg_r(gspca_dev, 0x0088);
-                sd->green_gain = reg_r(gspca_dev, 0x0089);
-                reg80 &= ~0x0400;               /* AWB off */
-        }
-        reg_w(gspca_dev, reg80);
-        reg_w(gspca_dev, reg80);
-}
-
-static void init_gains(struct gspca_dev *gspca_dev)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-        u16 reg80;
-        u8 all_gain_reg[8] =
-                {0x87, 0x00, 0x88, 0x00, 0x89, 0x00, 0x80, 0x00};
-
-        all_gain_reg[1] = sd->red_gain;
-        all_gain_reg[3] = sd->blue_gain;
-        all_gain_reg[5] = sd->green_gain;
-        reg80 = sensor_data[sd->sensor].reg80;
-        if (!sd->awb)
-                reg80 &= ~0x04;
-        all_gain_reg[7] = reg80;
-        reg_w_buf(gspca_dev, all_gain_reg, sizeof all_gain_reg);
-
-        reg_w(gspca_dev, (sd->red_gain  << 8) + 0x87);
-        reg_w(gspca_dev, (sd->blue_gain << 8) + 0x88);
-        reg_w(gspca_dev, (sd->green_gain  << 8) + 0x89);
-}
-
-static void setsharpness(struct gspca_dev *gspca_dev)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
         u16 reg_to_write;
 
-        reg_to_write = 0x0aa6 + 0x1000 * sd->sharpness;
+        reg_to_write = 0x0aa6 + 0x1000 * val;
 
         reg_w(gspca_dev, reg_to_write);
 }
 
-static void setfreq(struct gspca_dev *gspca_dev)
+static void setfreq(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u8 reg66;
@@ -829,7 +547,7 @@ static void setfreq(struct gspca_dev *gspca_dev)
 
         switch (sd->sensor) {
         case SENSOR_LT168G:
-                if (sd->freq != 0)
+                if (val != 0)
                         freq[3] = 0xa8;
                 reg66 = 0x41;
                 break;
@@ -840,7 +558,7 @@ static void setfreq(struct gspca_dev *gspca_dev)
                 reg66 = 0x40;
                 break;
         }
-        switch (sd->freq) {
+        switch (val) {
         case 0:                         /* no flicker */
                 freq[3] = 0xf0;
                 break;
@@ -941,14 +659,9 @@ static int sd_init(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, (sensor->reg80 << 8) + 0x80);
         reg_w(gspca_dev, (sensor->reg80 << 8) + 0x80);
         reg_w(gspca_dev, (sensor->reg8e << 8) + 0x8e);
-
-        setbrightness(gspca_dev);
-        setcontrast(gspca_dev);
-        setgamma(gspca_dev);
-        setcolors(gspca_dev);
-        setsharpness(gspca_dev);
-        init_gains(gspca_dev);
-        setfreq(gspca_dev);
+        reg_w(gspca_dev, (0x20 << 8) + 0x87);
+        reg_w(gspca_dev, (0x20 << 8) + 0x88);
+        reg_w(gspca_dev, (0x20 << 8) + 0x89);
 
         reg_w_buf(gspca_dev, sensor->data5, sizeof sensor->data5);
         reg_w_buf(gspca_dev, sensor->nset8, sizeof sensor->nset8);
@@ -968,31 +681,44 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void setmirror(struct gspca_dev *gspca_dev)
+static void setmirror(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u8 hflipcmd[8] =
                 {0x62, 0x07, 0x63, 0x03, 0x64, 0x00, 0x60, 0x09};
 
-        if (sd->mirror)
+        if (val)
                 hflipcmd[3] = 0x01;
 
         reg_w_buf(gspca_dev, hflipcmd, sizeof hflipcmd);
 }
 
-static void seteffect(struct gspca_dev *gspca_dev)
+static void seteffect(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        int idx = 0;
 
-        reg_w_buf(gspca_dev, effects_table[sd->effect],
-                                sizeof effects_table[0]);
-        if (sd->effect == 1 || sd->effect == 5) {
-                PDEBUG(D_CONF,
-                       "This effect have been disabled for webcam \"safety\"");
-                return;
+        switch (val) {
+        case V4L2_COLORFX_NONE:
+                break;
+        case V4L2_COLORFX_BW:
+                idx = 2;
+                break;
+        case V4L2_COLORFX_SEPIA:
+                idx = 3;
+                break;
+        case V4L2_COLORFX_SKETCH:
+                idx = 4;
+                break;
+        case V4L2_COLORFX_NEGATIVE:
+                idx = 6;
+                break;
+        default:
+                break;
         }
 
-        if (sd->effect == 1 || sd->effect == 4)
+        reg_w_buf(gspca_dev, effects_table[idx],
+                                sizeof effects_table[0]);
+
+        if (val == V4L2_COLORFX_SKETCH)
                 reg_w(gspca_dev, 0x4aa6);
         else
                 reg_w(gspca_dev, 0xfaa6);
@@ -1070,7 +796,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 break;
         }
         sensor = &sensor_data[sd->sensor];
-        setfreq(gspca_dev);
+        setfreq(gspca_dev, v4l2_ctrl_g_ctrl(sd->freq));
         reg_r(gspca_dev, 0x0012);
         reg_w_buf(gspca_dev, t2, sizeof t2);
         reg_w_ixbuf(gspca_dev, 0xb3, t3, sizeof t3);
@@ -1142,296 +868,157 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         gspca_frame_add(gspca_dev, pkt_type, data, len);
 }
 
-static int sd_setblue_gain(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->blue_gain = val;
-        if (gspca_dev->streaming)
-                reg_w(gspca_dev, (val << 8) + 0x88);
-        return 0;
-}
-
-static int sd_getblue_gain(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->blue_gain;
-        return 0;
-}
-
-static int sd_setred_gain(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->red_gain = val;
-        if (gspca_dev->streaming)
-                reg_w(gspca_dev, (val << 8) + 0x87);
-
-        return 0;
-}
-
-static int sd_getred_gain(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->red_gain;
-        return 0;
-}
-
-static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-        u16 psg, nsg;
-
-        psg = sd->red_gain + sd->blue_gain + sd->green_gain;
-        nsg = val * 3;
-        sd->red_gain = sd->red_gain * nsg / psg;
-        if (sd->red_gain > 0x40)
-                sd->red_gain = 0x40;
-        else if (sd->red_gain < 0x10)
-                sd->red_gain = 0x10;
-        sd->blue_gain = sd->blue_gain * nsg / psg;
-        if (sd->blue_gain > 0x40)
-                sd->blue_gain = 0x40;
-        else if (sd->blue_gain < 0x10)
-                sd->blue_gain = 0x10;
-        sd->green_gain = sd->green_gain * nsg / psg;
-        if (sd->green_gain > 0x40)
-                sd->green_gain = 0x40;
-        else if (sd->green_gain < 0x10)
-                sd->green_gain = 0x10;
-
-        if (gspca_dev->streaming)
-                setRGB(gspca_dev);
-        return 0;
-}
-
-static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = (sd->red_gain + sd->blue_gain + sd->green_gain) / 3;
-        return 0;
-}
-
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->brightness = val;
-        if (gspca_dev->streaming)
-                setbrightness(gspca_dev);
-        return 0;
-}
-
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->brightness;
-        return *val;
-}
-
-static int sd_setawb(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->awb = val;
-        if (gspca_dev->streaming)
-                setawb(gspca_dev);
-        return 0;
-}
-
-static int sd_getawb(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->awb;
-        return *val;
-}
-
-static int sd_setmirror(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->mirror = val;
-        if (gspca_dev->streaming)
-                setmirror(gspca_dev);
-        return 0;
-}
-
-static int sd_getmirror(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->mirror;
-        return *val;
-}
-
-static int sd_seteffect(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->effect = val;
-        if (gspca_dev->streaming)
-                seteffect(gspca_dev);
-        return 0;
-}
-
-static int sd_geteffect(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->effect;
-        return *val;
-}
-
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->contrast = val;
-        if (gspca_dev->streaming)
-                setcontrast(gspca_dev);
-        return 0;
-}
-
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->contrast;
-        return *val;
-}
-
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->colors = val;
-        if (gspca_dev->streaming)
-                setcolors(gspca_dev);
-        return 0;
-}
-
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->colors;
-        return 0;
-}
-
-static int sd_setgamma(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->gamma = val;
-        if (gspca_dev->streaming)
-                setgamma(gspca_dev);
-        return 0;
-}
-
-static int sd_getgamma(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->gamma;
-        return 0;
-}
-
-static int sd_setfreq(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->freq = val;
-        if (gspca_dev->streaming)
-                setfreq(gspca_dev);
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
+        s32 red_gain, blue_gain, green_gain;
+
+        gspca_dev->usb_err = 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_AUTO_WHITE_BALANCE:
+                red_gain = reg_r(gspca_dev, 0x0087);
+                if (red_gain > 0x40)
+                        red_gain = 0x40;
+                else if (red_gain < 0x10)
+                        red_gain = 0x10;
+
+                blue_gain = reg_r(gspca_dev, 0x0088);
+                if (blue_gain > 0x40)
+                        blue_gain = 0x40;
+                else if (blue_gain < 0x10)
+                        blue_gain = 0x10;
+
+                green_gain = reg_r(gspca_dev, 0x0089);
+                if (green_gain > 0x40)
+                        green_gain = 0x40;
+                else if (green_gain < 0x10)
+                        green_gain = 0x10;
+
+                sd->gain->val = green_gain;
+                sd->red_balance->val = red_gain - green_gain;
+                sd->blue_balance->val = blue_gain - green_gain;
+                break;
+        }
         return 0;
 }
 
-static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
 
-        *val = sd->freq;
-        return 0;
-}
+        gspca_dev->usb_err = 0;
 
-static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        if (!gspca_dev->streaming)
+                return 0;
 
-        sd->sharpness = val;
-        if (gspca_dev->streaming)
-                setsharpness(gspca_dev);
-        return 0;
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                setcontrast(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_SATURATION:
+                setcolors(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_GAMMA:
+                setgamma(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_HFLIP:
+                setmirror(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_SHARPNESS:
+                setsharpness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_POWER_LINE_FREQUENCY:
+                setfreq(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_BACKLIGHT_COMPENSATION:
+                reg_w(gspca_dev, ctrl->val ? 0xf48e : 0xb48e);
+                break;
+        case V4L2_CID_AUTO_WHITE_BALANCE:
+                setawb_n_RGB(gspca_dev);
+                break;
+        case V4L2_CID_COLORFX:
+                seteffect(gspca_dev, ctrl->val);
+                break;
+        }
+        return gspca_dev->usb_err;
 }
 
-static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->sharpness;
-        return 0;
-}
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .g_volatile_ctrl = sd_g_volatile_ctrl,
+        .s_ctrl = sd_s_ctrl,
+};
 
-/* Low Light set  here......*/
-static int sd_setlowlight(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_init_controls(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct sd *sd = (struct sd *)gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 12);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 14, 1, 8);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, 0x0d, 1, 7);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SATURATION, 0, 0xf, 1, 5);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_GAMMA, 0, GAMMA_MAX, 1, 10);
+        /* Activate lowlight, some apps dont bring up the
+           backlight_compensation control) */
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BACKLIGHT_COMPENSATION, 0, 1, 1, 1);
+        if (sd->sensor == SENSOR_TAS5130A)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                                V4L2_CID_HFLIP, 0, 1, 1, 0);
+        sd->awb = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_AUTO_WHITE_BALANCE, 0, 1, 1, 1);
+        sd->gain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_GAIN, 0x10, 0x40, 1, 0x20);
+        sd->blue_balance = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BLUE_BALANCE, -0x30, 0x30, 1, 0);
+        sd->red_balance = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_RED_BALANCE, -0x30, 0x30, 1, 0);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SHARPNESS, 0, 15, 1, 6);
+        v4l2_ctrl_new_std_menu(hdl, &sd_ctrl_ops,
+                        V4L2_CID_COLORFX, V4L2_COLORFX_SKETCH,
+                        ~((1 << V4L2_COLORFX_NONE) |
+                          (1 << V4L2_COLORFX_BW) |
+                          (1 << V4L2_COLORFX_SEPIA) |
+                          (1 << V4L2_COLORFX_SKETCH) |
+                          (1 << V4L2_COLORFX_NEGATIVE)),
+                        V4L2_COLORFX_NONE);
+        sd->freq = v4l2_ctrl_new_std_menu(hdl, &sd_ctrl_ops,
+                        V4L2_CID_POWER_LINE_FREQUENCY,
+                        V4L2_CID_POWER_LINE_FREQUENCY_60HZ, 1,
+                        V4L2_CID_POWER_LINE_FREQUENCY_50HZ);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
 
-        sd->autogain = val;
-        if (val != 0)
-                reg_w(gspca_dev, 0xf48e);
-        else
-                reg_w(gspca_dev, 0xb48e);
-        return 0;
-}
+        v4l2_ctrl_auto_cluster(4, &sd->awb, 0, true);
 
-static int sd_getlowlight(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->autogain;
         return 0;
 }
 
-static int sd_querymenu(struct gspca_dev *gspca_dev,
-                        struct v4l2_querymenu *menu)
-{
-        static const char *freq_nm[3] = {"NoFliker", "50 Hz", "60 Hz"};
-
-        switch (menu->id) {
-        case V4L2_CID_POWER_LINE_FREQUENCY:
-                if ((unsigned) menu->index >= ARRAY_SIZE(freq_nm))
-                        break;
-                strcpy((char *) menu->name, freq_nm[menu->index]);
-                return 0;
-        case V4L2_CID_EFFECTS:
-                if ((unsigned) menu->index < ARRAY_SIZE(effects_control)) {
-                        strlcpy((char *) menu->name,
-                                effects_control[menu->index],
-                                sizeof menu->name);
-                        return 0;
-                }
-                break;
-        }
-        return -EINVAL;
-}
-
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
         .pkt_scan = sd_pkt_scan,
-        .querymenu = sd_querymenu,
 #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
         .other_input = 1,
 #endif
@@ -1460,6 +1047,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/topro.c b/drivers/media/video/gspca/topro.c
index c6326d177a3d..a6055246cb9d 100644
--- a/drivers/media/video/gspca/topro.c
+++ b/drivers/media/video/gspca/topro.c
@@ -120,24 +120,13 @@ static const u8 jpeg_head[] = {
 #define JPEG_HDR_SZ 521
 };
 
-enum e_ctrl {
-        EXPOSURE,
-        QUALITY,
-        SHARPNESS,
-        RGAIN,
-        GAIN,
-        BGAIN,
-        GAMMA,
-        AUTOGAIN,
-        NCTRLS          /* number of controls */
-};
-
-#define AUTOGAIN_DEF 1
-
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
-
-        struct gspca_ctrl ctrls[NCTRLS];
+        struct v4l2_ctrl *jpegqual;
+        struct v4l2_ctrl *sharpness;
+        struct v4l2_ctrl *gamma;
+        struct v4l2_ctrl *blue;
+        struct v4l2_ctrl *red;
 
         u8 framerate;
         u8 quality;             /* webcam current JPEG quality (0..16) */
@@ -1415,32 +1404,33 @@ static void soi763a_6810_init(struct gspca_dev *gspca_dev)
 }
 
 /* set the gain and exposure */
-static void setexposure(struct gspca_dev *gspca_dev)
+static void setexposure(struct gspca_dev *gspca_dev, s32 expo, s32 gain,
+                                                        s32 blue, s32 red)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
         if (sd->sensor == SENSOR_CX0342) {
-                int expo;
-
-                expo = (sd->ctrls[EXPOSURE].val << 2) - 1;
+                expo = (expo << 2) - 1;
                 i2c_w(gspca_dev, CX0342_EXPO_LINE_L, expo);
                 i2c_w(gspca_dev, CX0342_EXPO_LINE_H, expo >> 8);
                 if (sd->bridge == BRIDGE_TP6800)
                         i2c_w(gspca_dev, CX0342_RAW_GBGAIN_H,
-                                                sd->ctrls[GAIN].val >> 8);
-                i2c_w(gspca_dev, CX0342_RAW_GBGAIN_L, sd->ctrls[GAIN].val);
+                                                gain >> 8);
+                i2c_w(gspca_dev, CX0342_RAW_GBGAIN_L, gain);
                 if (sd->bridge == BRIDGE_TP6800)
                         i2c_w(gspca_dev, CX0342_RAW_GRGAIN_H,
-                                                sd->ctrls[GAIN].val >> 8);
-                i2c_w(gspca_dev, CX0342_RAW_GRGAIN_L, sd->ctrls[GAIN].val);
-                if (sd->bridge == BRIDGE_TP6800)
-                        i2c_w(gspca_dev, CX0342_RAW_BGAIN_H,
-                                                sd->ctrls[BGAIN].val >> 8);
-                i2c_w(gspca_dev, CX0342_RAW_BGAIN_L, sd->ctrls[BGAIN].val);
-                if (sd->bridge == BRIDGE_TP6800)
-                        i2c_w(gspca_dev, CX0342_RAW_RGAIN_H,
-                                                sd->ctrls[RGAIN].val >> 8);
-                i2c_w(gspca_dev, CX0342_RAW_RGAIN_L, sd->ctrls[RGAIN].val);
+                                        gain >> 8);
+                i2c_w(gspca_dev, CX0342_RAW_GRGAIN_L, gain);
+                if (sd->sensor == SENSOR_CX0342) {
+                        if (sd->bridge == BRIDGE_TP6800)
+                                i2c_w(gspca_dev, CX0342_RAW_BGAIN_H,
+                                                blue >> 8);
+                        i2c_w(gspca_dev, CX0342_RAW_BGAIN_L, blue);
+                        if (sd->bridge == BRIDGE_TP6800)
+                                i2c_w(gspca_dev, CX0342_RAW_RGAIN_H,
+                                                red >> 8);
+                        i2c_w(gspca_dev, CX0342_RAW_RGAIN_L, red);
+                }
                 i2c_w(gspca_dev, CX0342_SYS_CTRL_0,
                                 sd->bridge == BRIDGE_TP6800 ? 0x80 : 0x81);
                 return;
@@ -1448,10 +1438,10 @@ static void setexposure(struct gspca_dev *gspca_dev)
 
         /* soi763a */
         i2c_w(gspca_dev, 0x10,          /* AEC_H (exposure time) */
-                         sd->ctrls[EXPOSURE].val);
+                         expo);
 /*      i2c_w(gspca_dev, 0x76, 0x02);    * AEC_L ([1:0] */
         i2c_w(gspca_dev, 0x00,          /* gain */
-                         sd->ctrls[GAIN].val);
+                         gain);
 }
 
 /* set the JPEG quantization tables */
@@ -1472,12 +1462,10 @@ static void set_dqt(struct gspca_dev *gspca_dev, u8 q)
 }
 
 /* set the JPEG compression quality factor */
-static void setquality(struct gspca_dev *gspca_dev)
+static void setquality(struct gspca_dev *gspca_dev, s32 q)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        u16 q;
 
-        q = sd->ctrls[QUALITY].val;
         if (q != 16)
                 q = 15 - q;
 
@@ -1508,10 +1496,9 @@ static const u8 color_gain[NSENSORS][18] = {
          0xd5, 0x00, 0x46, 0x03, 0xdc, 0x03},   /* V R/G/B */
 };
 
-static void setgamma(struct gspca_dev *gspca_dev)
+static void setgamma(struct gspca_dev *gspca_dev, s32 gamma)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        int gamma;
 #define NGAMMA 6
         static const u8 gamma_tb[NGAMMA][3][1024] = {
             {                           /* gamma 0 - from tp6800 + soi763a */
@@ -3836,7 +3823,6 @@ static void setgamma(struct gspca_dev *gspca_dev)
         if (sd->bridge == BRIDGE_TP6810)
                 reg_w(gspca_dev, 0x02, 0x28);
 /*      msleep(50); */
-        gamma = sd->ctrls[GAMMA].val;
         bulk_w(gspca_dev, 0x00, gamma_tb[gamma][0], 1024);
         bulk_w(gspca_dev, 0x01, gamma_tb[gamma][1], 1024);
         bulk_w(gspca_dev, 0x02, gamma_tb[gamma][2], 1024);
@@ -3864,43 +3850,35 @@ static void setgamma(struct gspca_dev *gspca_dev)
 /*      msleep(50); */
 }
 
-static void setsharpness(struct gspca_dev *gspca_dev)
+static void setsharpness(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        u8 val;
 
         if (sd->bridge == BRIDGE_TP6800) {
-                val = sd->ctrls[SHARPNESS].val
-                                | 0x08;         /* grid compensation enable */
+                val |= 0x08;            /* grid compensation enable */
                 if (gspca_dev->width == 640)
                         reg_w(gspca_dev, TP6800_R78_FORMAT, 0x00); /* vga */
                 else
                         val |= 0x04;            /* scaling down enable */
                 reg_w(gspca_dev, TP6800_R5D_DEMOSAIC_CFG, val);
         } else {
-                val = (sd->ctrls[SHARPNESS].val << 5) | 0x08;
+                val = (val << 5) | 0x08;
                 reg_w(gspca_dev, 0x59, val);
         }
 }
 
-static void setautogain(struct gspca_dev *gspca_dev)
+static void setautogain(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        if (gspca_dev->ctrl_dis & (1 << AUTOGAIN))
-                return;
-        if (sd->ctrls[AUTOGAIN].val) {
-                sd->ag_cnt = AG_CNT_START;
-                gspca_dev->ctrl_inac |= (1 << EXPOSURE) | (1 << GAIN);
-        } else {
-                sd->ag_cnt = -1;
-                gspca_dev->ctrl_inac &= ~((1 << EXPOSURE) | (1 << GAIN));
-        }
+        sd->ag_cnt = val ? AG_CNT_START : -1;
 }
 
 /* set the resolution for sensor cx0342 */
 static void set_resolution(struct gspca_dev *gspca_dev)
 {
+        struct sd *sd = (struct sd *) gspca_dev;
+
         reg_w(gspca_dev, TP6800_R21_ENDP_1_CTL, 0x00);
         if (gspca_dev->width == 320) {
                 reg_w(gspca_dev, TP6800_R3F_FRAME_RATE, 0x06);
@@ -3926,8 +3904,9 @@ static void set_resolution(struct gspca_dev *gspca_dev)
         i2c_w(gspca_dev, CX0342_SYS_CTRL_0, 0x01);
         bulk_w(gspca_dev, 0x03, color_gain[SENSOR_CX0342],
                                 ARRAY_SIZE(color_gain[0]));
-        setgamma(gspca_dev);
-        setquality(gspca_dev);
+        setgamma(gspca_dev, v4l2_ctrl_g_ctrl(sd->gamma));
+        if (sd->sensor == SENSOR_SOI763A)
+                setquality(gspca_dev, v4l2_ctrl_g_ctrl(sd->jpegqual));
 }
 
 /* convert the frame rate to a tp68x0 value */
@@ -3963,7 +3942,7 @@ static int get_fr_idx(struct gspca_dev *gspca_dev)
         return i;
 }
 
-static void setframerate(struct gspca_dev *gspca_dev)
+static void setframerate(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u8 fr_idx;
@@ -3974,7 +3953,7 @@ static void setframerate(struct gspca_dev *gspca_dev)
                 reg_r(gspca_dev, 0x7b);
                 reg_w(gspca_dev, 0x7b,
                         sd->sensor == SENSOR_CX0342 ? 0x10 : 0x90);
-                if (sd->ctrls[EXPOSURE].val >= 128)
+                if (val >= 128)
                         fr_idx = 0xf0;          /* lower frame rate */
         }
 
@@ -3984,43 +3963,43 @@ static void setframerate(struct gspca_dev *gspca_dev)
                 i2c_w(gspca_dev, CX0342_AUTO_ADC_CALIB, 0x01);
 }
 
-static void setrgain(struct gspca_dev *gspca_dev)
+static void setrgain(struct gspca_dev *gspca_dev, s32 rgain)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        int rgain;
-
-        rgain = sd->ctrls[RGAIN].val;
         i2c_w(gspca_dev, CX0342_RAW_RGAIN_H, rgain >> 8);
         i2c_w(gspca_dev, CX0342_RAW_RGAIN_L, rgain);
         i2c_w(gspca_dev, CX0342_SYS_CTRL_0, 0x80);
 }
 
-static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_setgain(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 val = gspca_dev->gain->val;
 
         if (sd->sensor == SENSOR_CX0342) {
-                sd->ctrls[BGAIN].val = sd->ctrls[BGAIN].val
-                                        * val / sd->ctrls[GAIN].val;
-                if (sd->ctrls[BGAIN].val > 4095)
-                        sd->ctrls[BGAIN].val = 4095;
-                sd->ctrls[RGAIN].val = sd->ctrls[RGAIN].val
-                                        * val / sd->ctrls[GAIN].val;
-                if (sd->ctrls[RGAIN].val > 4095)
-                        sd->ctrls[RGAIN].val = 4095;
+                s32 old = gspca_dev->gain->cur.val ?
+                                        gspca_dev->gain->cur.val : 1;
+
+                sd->blue->val = sd->blue->val * val / old;
+                if (sd->blue->val > 4095)
+                        sd->blue->val = 4095;
+                sd->red->val = sd->red->val * val / old;
+                if (sd->red->val > 4095)
+                        sd->red->val = 4095;
+        }
+        if (gspca_dev->streaming) {
+                if (sd->sensor == SENSOR_CX0342)
+                        setexposure(gspca_dev, gspca_dev->exposure->val,
+                                        gspca_dev->gain->val,
+                                        sd->blue->val, sd->red->val);
+                else
+                        setexposure(gspca_dev, gspca_dev->exposure->val,
+                                        gspca_dev->gain->val, 0, 0);
         }
-        sd->ctrls[GAIN].val = val;
-        if (gspca_dev->streaming)
-                setexposure(gspca_dev);
         return gspca_dev->usb_err;
 }
 
-static void setbgain(struct gspca_dev *gspca_dev)
+static void setbgain(struct gspca_dev *gspca_dev, s32 bgain)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        int bgain;
-
-        bgain = sd->ctrls[BGAIN].val;
         i2c_w(gspca_dev, CX0342_RAW_BGAIN_H, bgain >> 8);
         i2c_w(gspca_dev, CX0342_RAW_BGAIN_L, bgain);
         i2c_w(gspca_dev, CX0342_SYS_CTRL_0, 0x80);
@@ -4040,7 +4019,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
                         framerates : framerates_6810;
 
         sd->framerate = 30;             /* default: 30 fps */
-        gspca_dev->cam.ctrls = sd->ctrls;
         return 0;
 }
 
@@ -4108,32 +4086,16 @@ static int sd_init(struct gspca_dev *gspca_dev)
         }
         if (sd->sensor == SENSOR_SOI763A) {
                 pr_info("Sensor soi763a\n");
-                sd->ctrls[GAMMA].def = sd->bridge == BRIDGE_TP6800 ? 0 : 1;
-                sd->ctrls[GAIN].max = 15;
-                sd->ctrls[GAIN].def = 3;
-                gspca_dev->ctrl_dis = (1 << RGAIN) | (1 << BGAIN);
                 if (sd->bridge == BRIDGE_TP6810) {
                         soi763a_6810_init(gspca_dev);
-#if AUTOGAIN_DEF
-                        gspca_dev->ctrl_inac |= (1 << EXPOSURE) | (1 << GAIN);
-#endif
-                } else {
-                        gspca_dev->ctrl_dis |= (1 << AUTOGAIN);
                 }
         } else {
                 pr_info("Sensor cx0342\n");
                 if (sd->bridge == BRIDGE_TP6810) {
                         cx0342_6810_init(gspca_dev);
-#if AUTOGAIN_DEF
-                        gspca_dev->ctrl_inac |= (1 << EXPOSURE) | (1 << GAIN);
-#endif
-                } else {
-                        gspca_dev->ctrl_dis |= (1 << AUTOGAIN);
                 }
         }
 
-        if (sd->bridge == BRIDGE_TP6810)
-                sd->ctrls[QUALITY].def = 0;     /* auto quality */
         set_dqt(gspca_dev, 0);
         return 0;
 }
@@ -4207,8 +4169,9 @@ static void set_led(struct gspca_dev *gspca_dev, int on)
 
 static void cx0342_6800_start(struct gspca_dev *gspca_dev)
 {
+        struct sd *sd = (struct sd *) gspca_dev;
         static const struct cmd reg_init[] = {
-/*fixme: is this usefull?*/
+                /* fixme: is this useful? */
                 {TP6800_R17_GPIO_IO, 0x9f},
                 {TP6800_R16_GPIO_PD, 0x40},
                 {TP6800_R10_SIF_TYPE, 0x00},    /* i2c 8 bits */
@@ -4279,13 +4242,21 @@ static void cx0342_6800_start(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, TP6800_R54_DARK_CFG, 0x00);
         i2c_w(gspca_dev, CX0342_EXPO_LINE_H, 0x00);
         i2c_w(gspca_dev, CX0342_SYS_CTRL_0, 0x01);
-        setexposure(gspca_dev);
+        if (sd->sensor == SENSOR_CX0342)
+                setexposure(gspca_dev, v4l2_ctrl_g_ctrl(gspca_dev->exposure),
+                        v4l2_ctrl_g_ctrl(gspca_dev->gain),
+                        v4l2_ctrl_g_ctrl(sd->blue),
+                        v4l2_ctrl_g_ctrl(sd->red));
+        else
+                setexposure(gspca_dev, v4l2_ctrl_g_ctrl(gspca_dev->exposure),
+                        v4l2_ctrl_g_ctrl(gspca_dev->gain), 0, 0);
         set_led(gspca_dev, 1);
         set_resolution(gspca_dev);
 }
 
 static void cx0342_6810_start(struct gspca_dev *gspca_dev)
 {
+        struct sd *sd = (struct sd *) gspca_dev;
         static const struct cmd sensor_init_2[] = {
                 {CX0342_EXPO_LINE_L, 0x6f},
                 {CX0342_EXPO_LINE_H, 0x02},
@@ -4366,10 +4337,10 @@ static void cx0342_6810_start(struct gspca_dev *gspca_dev)
                 reg_w(gspca_dev, 0x07, 0x85);
                 reg_w(gspca_dev, TP6800_R78_FORMAT, 0x01);      /* qvga */
         }
-        setgamma(gspca_dev);
+        setgamma(gspca_dev, v4l2_ctrl_g_ctrl(sd->gamma));
         reg_w_buf(gspca_dev, tp6810_bridge_start,
                         ARRAY_SIZE(tp6810_bridge_start));
-        setsharpness(gspca_dev);
+        setsharpness(gspca_dev, v4l2_ctrl_g_ctrl(sd->sharpness));
         bulk_w(gspca_dev, 0x03, color_gain[SENSOR_CX0342],
                                 ARRAY_SIZE(color_gain[0]));
         reg_w(gspca_dev, TP6800_R3F_FRAME_RATE, 0x87);
@@ -4380,11 +4351,12 @@ static void cx0342_6810_start(struct gspca_dev *gspca_dev)
         i2c_w_buf(gspca_dev, sensor_init_5, ARRAY_SIZE(sensor_init_5));
 
         set_led(gspca_dev, 1);
-/*      setquality(gspca_dev); */
+/*      setquality(gspca_dev, v4l2_ctrl_g_ctrl(sd->jpegqual)); */
 }
 
 static void soi763a_6800_start(struct gspca_dev *gspca_dev)
 {
+        struct sd *sd = (struct sd *) gspca_dev;
         static const struct cmd reg_init[] = {
                 {TP6800_R79_QUALITY, 0x04},
                 {TP6800_R79_QUALITY, 0x01},
@@ -4484,19 +4456,28 @@ static void soi763a_6800_start(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, TP6800_R5C_EDGE_THRLD, 0x10);
         reg_w(gspca_dev, TP6800_R54_DARK_CFG, 0x00);
 
-        setsharpness(gspca_dev);
+        setsharpness(gspca_dev, v4l2_ctrl_g_ctrl(sd->sharpness));
 
         bulk_w(gspca_dev, 0x03, color_gain[SENSOR_SOI763A],
                                 ARRAY_SIZE(color_gain[0]));
 
         set_led(gspca_dev, 1);
-        setexposure(gspca_dev);
-        setquality(gspca_dev);
-        setgamma(gspca_dev);
+        if (sd->sensor == SENSOR_CX0342)
+                setexposure(gspca_dev, v4l2_ctrl_g_ctrl(gspca_dev->exposure),
+                        v4l2_ctrl_g_ctrl(gspca_dev->gain),
+                        v4l2_ctrl_g_ctrl(sd->blue),
+                        v4l2_ctrl_g_ctrl(sd->red));
+        else
+                setexposure(gspca_dev, v4l2_ctrl_g_ctrl(gspca_dev->exposure),
+                        v4l2_ctrl_g_ctrl(gspca_dev->gain), 0, 0);
+        if (sd->sensor == SENSOR_SOI763A)
+                setquality(gspca_dev, v4l2_ctrl_g_ctrl(sd->jpegqual));
+        setgamma(gspca_dev, v4l2_ctrl_g_ctrl(sd->gamma));
 }
 
 static void soi763a_6810_start(struct gspca_dev *gspca_dev)
 {
+        struct sd *sd = (struct sd *) gspca_dev;
         static const struct cmd bridge_init_2[] = {
                 {TP6800_R7A_BLK_THRLD, 0x00},
                 {TP6800_R79_QUALITY, 0x04},
@@ -4520,7 +4501,14 @@ static void soi763a_6810_start(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, 0x22, gspca_dev->alt);
         bulk_w(gspca_dev, 0x03, color_null, sizeof color_null);
         reg_w(gspca_dev, 0x59, 0x40);
-        setexposure(gspca_dev);
+        if (sd->sensor == SENSOR_CX0342)
+                setexposure(gspca_dev, v4l2_ctrl_g_ctrl(gspca_dev->exposure),
+                        v4l2_ctrl_g_ctrl(gspca_dev->gain),
+                        v4l2_ctrl_g_ctrl(sd->blue),
+                        v4l2_ctrl_g_ctrl(sd->red));
+        else
+                setexposure(gspca_dev, v4l2_ctrl_g_ctrl(gspca_dev->exposure),
+                        v4l2_ctrl_g_ctrl(gspca_dev->gain), 0, 0);
         reg_w_buf(gspca_dev, bridge_init_2, ARRAY_SIZE(bridge_init_2));
         reg_w_buf(gspca_dev, tp6810_ov_init_common,
                         ARRAY_SIZE(tp6810_ov_init_common));
@@ -4534,7 +4522,7 @@ static void soi763a_6810_start(struct gspca_dev *gspca_dev)
                 reg_w(gspca_dev, 0x07, 0x85);
                 reg_w(gspca_dev, TP6800_R78_FORMAT, 0x01);      /* qvga */
         }
-        setgamma(gspca_dev);
+        setgamma(gspca_dev, v4l2_ctrl_g_ctrl(sd->gamma));
         reg_w_buf(gspca_dev, tp6810_bridge_start,
                         ARRAY_SIZE(tp6810_bridge_start));
 
@@ -4545,12 +4533,19 @@ static void soi763a_6810_start(struct gspca_dev *gspca_dev)
 
         reg_w(gspca_dev, 0x00, 0x00);
 
-        setsharpness(gspca_dev);
+        setsharpness(gspca_dev, v4l2_ctrl_g_ctrl(sd->sharpness));
         bulk_w(gspca_dev, 0x03, color_gain[SENSOR_SOI763A],
                                 ARRAY_SIZE(color_gain[0]));
         set_led(gspca_dev, 1);
         reg_w(gspca_dev, TP6800_R3F_FRAME_RATE, 0xf0);
-        setexposure(gspca_dev);
+        if (sd->sensor == SENSOR_CX0342)
+                setexposure(gspca_dev, v4l2_ctrl_g_ctrl(gspca_dev->exposure),
+                        v4l2_ctrl_g_ctrl(gspca_dev->gain),
+                        v4l2_ctrl_g_ctrl(sd->blue),
+                        v4l2_ctrl_g_ctrl(sd->red));
+        else
+                setexposure(gspca_dev, v4l2_ctrl_g_ctrl(gspca_dev->exposure),
+                        v4l2_ctrl_g_ctrl(gspca_dev->gain), 0, 0);
         reg_w_buf(gspca_dev, bridge_init_6, ARRAY_SIZE(bridge_init_6));
 }
 
@@ -4576,12 +4571,25 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 reg_w(gspca_dev, 0x80, 0x03);
                 reg_w(gspca_dev, 0x82, gspca_dev->curr_mode ? 0x0a : 0x0e);
 
-                setexposure(gspca_dev);
-                setquality(gspca_dev);
-                setautogain(gspca_dev);
+                if (sd->sensor == SENSOR_CX0342)
+                        setexposure(gspca_dev,
+                                v4l2_ctrl_g_ctrl(gspca_dev->exposure),
+                                v4l2_ctrl_g_ctrl(gspca_dev->gain),
+                                v4l2_ctrl_g_ctrl(sd->blue),
+                                v4l2_ctrl_g_ctrl(sd->red));
+                else
+                        setexposure(gspca_dev,
+                                v4l2_ctrl_g_ctrl(gspca_dev->exposure),
+                                v4l2_ctrl_g_ctrl(gspca_dev->gain), 0, 0);
+                if (sd->sensor == SENSOR_SOI763A)
+                        setquality(gspca_dev,
+                                   v4l2_ctrl_g_ctrl(sd->jpegqual));
+                if (sd->bridge == BRIDGE_TP6810)
+                        setautogain(gspca_dev,
+                                    v4l2_ctrl_g_ctrl(gspca_dev->autogain));
         }
 
-        setframerate(gspca_dev);
+        setframerate(gspca_dev, v4l2_ctrl_g_ctrl(gspca_dev->exposure));
 
         return gspca_dev->usb_err;
 }
@@ -4672,12 +4680,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         }
 }
 
-/* -- do autogain -- */
-/* gain setting is done in setexposure() for tp6810 */
-static void setgain(struct gspca_dev *gspca_dev) {}
-#define WANT_REGULAR_AUTOGAIN
-#include "autogain_functions.h"
-
 static void sd_dq_callback(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
@@ -4739,17 +4741,19 @@ static void sd_dq_callback(struct gspca_dev *gspca_dev)
                         luma /= 4;
                 reg_w(gspca_dev, 0x7d, 0x00);
 
-                expo = sd->ctrls[EXPOSURE].val;
-                ret = auto_gain_n_exposure(gspca_dev, luma,
+                expo = v4l2_ctrl_g_ctrl(gspca_dev->exposure);
+                ret = gspca_expo_autogain(gspca_dev, luma,
                                 60,     /* desired luma */
                                 6,      /* dead zone */
                                 2,      /* gain knee */
                                 70);    /* expo knee */
                 sd->ag_cnt = AG_CNT_START;
                 if (sd->bridge == BRIDGE_TP6810) {
-                        if ((expo >= 128 && sd->ctrls[EXPOSURE].val < 128)
-                         || (expo < 128 && sd->ctrls[EXPOSURE].val >= 128))
-                                setframerate(gspca_dev);
+                        int new_expo = v4l2_ctrl_g_ctrl(gspca_dev->exposure);
+
+                        if ((expo >= 128 && new_expo < 128)
+                         || (expo < 128 && new_expo >= 128))
+                                setframerate(gspca_dev, new_expo);
                 }
                 break;
         }
@@ -4789,7 +4793,7 @@ static void sd_set_streamparm(struct gspca_dev *gspca_dev,
 
         sd->framerate = tpf->denominator / tpf->numerator;
         if (gspca_dev->streaming)
-                setframerate(gspca_dev);
+                setframerate(gspca_dev, v4l2_ctrl_g_ctrl(gspca_dev->exposure));
 
         /* Return the actual framerate */
         i = get_fr_idx(gspca_dev);
@@ -4806,12 +4810,10 @@ static int sd_set_jcomp(struct gspca_dev *gspca_dev,
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        if (sd->sensor == SENSOR_SOI763A)
-                jpeg_set_qual(sd->jpeg_hdr, jcomp->quality);
-/*      else
-                fixme: TODO
-*/
-        return gspca_dev->usb_err;
+        if (sd->sensor != SENSOR_SOI763A)
+                return -ENOTTY;
+        v4l2_ctrl_s_ctrl(sd->jpegqual, jcomp->quality);
+        return 0;
 }
 
 static int sd_get_jcomp(struct gspca_dev *gspca_dev,
@@ -4819,118 +4821,109 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev,
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
+        if (sd->sensor != SENSOR_SOI763A)
+                return -ENOTTY;
         memset(jcomp, 0, sizeof *jcomp);
-        jcomp->quality = jpeg_q[sd->quality];
+        jcomp->quality = v4l2_ctrl_g_ctrl(sd->jpegqual);
         jcomp->jpeg_markers = V4L2_JPEG_MARKER_DHT
                         | V4L2_JPEG_MARKER_DQT;
         return 0;
 }
 
-static struct ctrl sd_ctrls[NCTRLS] = {
-[EXPOSURE] = {
-            {
-                .id = V4L2_CID_EXPOSURE,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Exposure",
-                .minimum = 0x01,
-                .maximum = 0xdc,
-                .step = 1,
-                .default_value = 0x4e,
-            },
-            .set_control = setexposure
-        },
-[QUALITY] = {
-            {
-                .id = V4L2_CID_PRIVATE_BASE,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Compression quality",
-                .minimum = 0,
-                .maximum = 15,
-                .step = 1,
-                .default_value = 13,
-            },
-            .set_control = setquality
-        },
-[RGAIN] = {
-            {
-                .id = V4L2_CID_RED_BALANCE,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Red balance",
-                .minimum = 0,
-                .maximum = 4095,
-                .step = 1,
-                .default_value = 256,
-            },
-            .set_control = setrgain
-        },
-[GAIN] = {
-            {
-                .id = V4L2_CID_GAIN,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Gain",
-                .minimum = 0,
-                .maximum = 4095,
-                .step = 1,
-                .default_value = 256,
-            },
-            .set = sd_setgain
-        },
-[BGAIN] = {
-            {
-                .id = V4L2_CID_BLUE_BALANCE,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Blue balance",
-                .minimum = 0,
-                .maximum = 4095,
-                .step = 1,
-                .default_value = 256,
-            },
-            .set_control = setbgain
-        },
-[SHARPNESS] = {
-            {
-                .id      = V4L2_CID_SHARPNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Sharpness",
-                .minimum = 0,
-                .maximum = 3,
-                .step    = 1,
-                .default_value = 2,
-            },
-            .set_control = setsharpness
-        },
-[GAMMA] = {
-            {
-                .id      = V4L2_CID_GAMMA,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Gamma",
-                .minimum = 0,
-                .maximum = NGAMMA - 1,
-                .step    = 1,
-                .default_value = 1,
-            },
-            .set_control = setgamma
-        },
-[AUTOGAIN] = {
-            {
-                .id      = V4L2_CID_AUTOGAIN,
-                .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                .name    = "Auto Gain",
-                .minimum = 0,
-                .maximum = 1,
-                .step    = 1,
-                .default_value = AUTOGAIN_DEF
-            },
-            .set_control = setautogain
-        },
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
+
+        gspca_dev->usb_err = 0;
+
+        if (!gspca_dev->streaming)
+                return 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_SHARPNESS:
+                setsharpness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_GAMMA:
+                setgamma(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_BLUE_BALANCE:
+                setbgain(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_RED_BALANCE:
+                setrgain(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_EXPOSURE:
+                sd_setgain(gspca_dev);
+                break;
+        case V4L2_CID_AUTOGAIN:
+                if (ctrl->val)
+                        break;
+                sd_setgain(gspca_dev);
+                break;
+        case V4L2_CID_JPEG_COMPRESSION_QUALITY:
+                jpeg_set_qual(sd->jpeg_hdr, ctrl->val);
+                break;
+        }
+        return gspca_dev->usb_err;
+}
+
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
 };
 
+static int sd_init_controls(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *)gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 4);
+        gspca_dev->exposure = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_EXPOSURE, 1, 0xdc, 1, 0x4e);
+        if (sd->sensor == SENSOR_CX0342) {
+                sd->red = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_RED_BALANCE, 0, 4095, 1, 256);
+                sd->blue = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BLUE_BALANCE, 0, 4095, 1, 256);
+        }
+        if (sd->sensor == SENSOR_SOI763A)
+                gspca_dev->gain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_GAIN, 0, 15, 1, 3);
+        else
+                gspca_dev->gain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_GAIN, 0, 4095, 1, 256);
+        sd->sharpness = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SHARPNESS, 0, 3, 1, 2);
+        sd->gamma = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_GAMMA, 0, NGAMMA - 1, 1,
+                        (sd->sensor == SENSOR_SOI763A &&
+                         sd->bridge == BRIDGE_TP6800) ? 0 : 1);
+        if (sd->bridge == BRIDGE_TP6810)
+                gspca_dev->autogain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+        if (sd->sensor == SENSOR_SOI763A)
+                sd->jpegqual = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_JPEG_COMPRESSION_QUALITY,
+                        0, 15, 1, (sd->bridge == BRIDGE_TP6810) ? 0 : 13);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+        if (gspca_dev->autogain)
+                v4l2_ctrl_auto_cluster(3, &gspca_dev->autogain, 0, false);
+        else
+                v4l2_ctrl_cluster(2, &gspca_dev->exposure);
+        return 0;
+}
+
 static const struct sd_desc sd_desc = {
         .name = KBUILD_MODNAME,
-        .ctrls = sd_ctrls,
-        .nctrls = NCTRLS,
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .isoc_init = sd_isoc_init,
         .start = sd_start,
         .stopN = sd_stopN,
diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c
index c8922c5ffbf5..8591324a53e1 100644
--- a/drivers/media/video/gspca/tv8532.c
+++ b/drivers/media/video/gspca/tv8532.c
@@ -30,49 +30,9 @@ MODULE_LICENSE("GPL");
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
 
-        __u16 exposure;
-        __u16 gain;
-
         __u8 packet;
 };
 
-/* V4L2 controls supported by the driver */
-static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val);
-
-static const struct ctrl sd_ctrls[] = {
-        {
-         {
-          .id = V4L2_CID_EXPOSURE,
-          .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Exposure",
-          .minimum = 1,
-          .maximum = 0x18f,
-          .step = 1,
-#define EXPOSURE_DEF 0x18f
-          .default_value = EXPOSURE_DEF,
-          },
-         .set = sd_setexposure,
-         .get = sd_getexposure,
-         },
-        {
-         {
-          .id = V4L2_CID_GAIN,
-          .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Gain",
-          .minimum = 0,
-          .maximum = 0x7ff,
-          .step = 1,
-#define GAIN_DEF 0x100
-          .default_value = GAIN_DEF,
-          },
-         .set = sd_setgain,
-         .get = sd_getgain,
-         },
-};
-
 static const struct v4l2_pix_format sif_mode[] = {
         {176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
                 .bytesperline = 176,
@@ -202,15 +162,12 @@ static void tv_8532WriteEEprom(struct gspca_dev *gspca_dev)
 static int sd_config(struct gspca_dev *gspca_dev,
                      const struct usb_device_id *id)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
 
         cam = &gspca_dev->cam;
         cam->cam_mode = sif_mode;
         cam->nmodes = ARRAY_SIZE(sif_mode);
 
-        sd->exposure = EXPOSURE_DEF;
-        sd->gain = GAIN_DEF;
         return 0;
 }
 
@@ -241,23 +198,19 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void setexposure(struct gspca_dev *gspca_dev)
+static void setexposure(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        reg_w2(gspca_dev, R1C_AD_EXPOSE_TIMEL, sd->exposure);
+        reg_w2(gspca_dev, R1C_AD_EXPOSE_TIMEL, val);
         reg_w1(gspca_dev, R00_PART_CONTROL, LATENT_CHANGE | EXPO_CHANGE);
                                                 /* 0x84 */
 }
 
-static void setgain(struct gspca_dev *gspca_dev)
+static void setgain(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        reg_w2(gspca_dev, R20_GAIN_G1L, sd->gain);
-        reg_w2(gspca_dev, R22_GAIN_RL, sd->gain);
-        reg_w2(gspca_dev, R24_GAIN_BL, sd->gain);
-        reg_w2(gspca_dev, R26_GAIN_G2L, sd->gain);
+        reg_w2(gspca_dev, R20_GAIN_G1L, val);
+        reg_w2(gspca_dev, R22_GAIN_RL, val);
+        reg_w2(gspca_dev, R24_GAIN_BL, val);
+        reg_w2(gspca_dev, R26_GAIN_G2L, val);
 }
 
 /* -- start the camera -- */
@@ -289,9 +242,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
         tv_8532_setReg(gspca_dev);
 
-        setexposure(gspca_dev);
-        setgain(gspca_dev);
-
         /************************************************/
         reg_w1(gspca_dev, R31_UPD, 0x01);       /* update registers */
         msleep(200);
@@ -339,49 +289,55 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         data + gspca_dev->width + 5, gspca_dev->width);
 }
 
-static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
 
-        sd->exposure = val;
-        if (gspca_dev->streaming)
-                setexposure(gspca_dev);
-        return 0;
-}
+        gspca_dev->usb_err = 0;
 
-static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        if (!gspca_dev->streaming)
+                return 0;
 
-        *val = sd->exposure;
-        return 0;
+        switch (ctrl->id) {
+        case V4L2_CID_EXPOSURE:
+                setexposure(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_GAIN:
+                setgain(gspca_dev, ctrl->val);
+                break;
+        }
+        return gspca_dev->usb_err;
 }
 
-static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->gain = val;
-        if (gspca_dev->streaming)
-                setgain(gspca_dev);
-        return 0;
-}
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
 
-static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val)
+static int sd_init_controls(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->gain;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 2);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_EXPOSURE, 0, 0x18f, 1, 0x18f);
+        v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_GAIN, 0, 0x7ff, 1, 0x100);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
         return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
         .pkt_scan = sd_pkt_scan,
@@ -415,6 +371,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index 208f6b2d512a..f21fd1677c38 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -33,18 +33,10 @@ MODULE_LICENSE("GPL");
 /* specific webcam descriptor */
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
-
-        u8 brightness;
-        u8 contrast;
-        u8 colors;
-        u8 hflip;
-        u8 vflip;
-        u8 lightfreq;
-        s8 sharpness;
-        u16 exposure;
-        u8 gain;
-        u8 autogain;
-        u8 backlight;
+        struct { /* hvflip cluster */
+                struct v4l2_ctrl *hflip;
+                struct v4l2_ctrl *vflip;
+        };
 
         u8 image_offset;
 
@@ -73,252 +65,6 @@ enum sensors {
         NSENSORS
 };
 
-/* V4L2 controls supported by the driver */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_gethflip(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setfreq(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setbacklight(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbacklight(struct gspca_dev *gspca_dev, __s32 *val);
-
-static const struct ctrl sd_ctrls[] = {
-#define BRIGHTNESS_IDX 0
-        {
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-#define BRIGHTNESS_DEF 128
-                .default_value = BRIGHTNESS_DEF,
-            },
-            .set = sd_setbrightness,
-            .get = sd_getbrightness,
-        },
-#define CONTRAST_IDX 1
-        {
-            {
-                .id      = V4L2_CID_CONTRAST,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Contrast",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-#define CONTRAST_DEF 127
-                .default_value = CONTRAST_DEF,
-            },
-            .set = sd_setcontrast,
-            .get = sd_getcontrast,
-        },
-#define COLORS_IDX 2
-        {
-            {
-                .id      = V4L2_CID_SATURATION,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Saturation",
-                .minimum = 1,
-                .maximum = 127,
-                .step    = 1,
-#define COLOR_DEF 63
-                .default_value = COLOR_DEF,
-            },
-            .set = sd_setcolors,
-            .get = sd_getcolors,
-        },
-/* next 2 controls work with some sensors only */
-#define HFLIP_IDX 3
-        {
-            {
-                .id      = V4L2_CID_HFLIP,
-                .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                .name    = "Mirror",
-                .minimum = 0,
-                .maximum = 1,
-                .step    = 1,
-#define HFLIP_DEF 0
-                .default_value = HFLIP_DEF,
-            },
-            .set = sd_sethflip,
-            .get = sd_gethflip,
-        },
-#define VFLIP_IDX 4
-        {
-            {
-                .id      = V4L2_CID_VFLIP,
-                .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                .name    = "Vflip",
-                .minimum = 0,
-                .maximum = 1,
-                .step    = 1,
-#define VFLIP_DEF 0
-                .default_value = VFLIP_DEF,
-            },
-            .set = sd_setvflip,
-            .get = sd_getvflip,
-        },
-#define LIGHTFREQ_IDX 5
-        {
-            {
-                .id      = V4L2_CID_POWER_LINE_FREQUENCY,
-                .type    = V4L2_CTRL_TYPE_MENU,
-                .name    = "Light frequency filter",
-                .minimum = 0,
-                .maximum = 2,   /* 0: No, 1: 50Hz, 2:60Hz */
-                .step    = 1,
-#define FREQ_DEF 1
-                .default_value = FREQ_DEF,
-            },
-            .set = sd_setfreq,
-            .get = sd_getfreq,
-        },
-#define SHARPNESS_IDX 6
-        {
-         {
-          .id = V4L2_CID_SHARPNESS,
-          .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Sharpness",
-          .minimum = -1,
-          .maximum = 2,
-          .step = 1,
-#define SHARPNESS_DEF -1
-          .default_value = SHARPNESS_DEF,
-          },
-         .set = sd_setsharpness,
-         .get = sd_getsharpness,
-         },
-#define GAIN_IDX 7
-        {
-            {
-                .id      = V4L2_CID_GAIN,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Gain",
-                .minimum = 0,
-                .maximum = 78,
-                .step    = 1,
-#define GAIN_DEF 0
-                .default_value = GAIN_DEF,
-            },
-            .set = sd_setgain,
-            .get = sd_getgain,
-        },
-#define EXPOSURE_IDX 8
-        {
-                {
-                        .id = V4L2_CID_EXPOSURE,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "Exposure",
-#define EXPOSURE_DEF 450
-                        .minimum = 0,
-                        .maximum = 4095,
-                        .step = 1,
-                        .default_value = EXPOSURE_DEF,
-                },
-                .set = sd_setexposure,
-                .get = sd_getexposure,
-        },
-#define AUTOGAIN_IDX 9
-        {
-                {
-                        .id = V4L2_CID_AUTOGAIN,
-                        .type = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name = "Automatic Gain and Exposure",
-                        .minimum = 0,
-                        .maximum = 1,
-                        .step = 1,
-#define AUTOGAIN_DEF 1
-                        .default_value = AUTOGAIN_DEF,
-                },
-                .set = sd_setautogain,
-                .get = sd_getautogain,
-        },
-#define BACKLIGHT_IDX 10
-        {
-                {
-                        .id = V4L2_CID_BACKLIGHT_COMPENSATION,
-                        .type = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name = "Backlight Compensation",
-                        .minimum = 0,
-                        .maximum = 15,
-                        .step = 1,
-#define BACKLIGHT_DEF 15
-                        .default_value = BACKLIGHT_DEF,
-                },
-                .set = sd_setbacklight,
-                .get = sd_getbacklight,
-        },
-};
-
-/* table of the disabled controls */
-static u32 ctrl_dis[NSENSORS] = {
-    [SENSOR_HV7131R] =
-        (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
-                | (1 << HFLIP_IDX) | (1 << VFLIP_IDX) | (1 << LIGHTFREQ_IDX)
-                | (1 << SHARPNESS_IDX)
-                | (1 << GAIN_IDX) | (1 << EXPOSURE_IDX)
-                | (1 << AUTOGAIN_IDX) | (1 << BACKLIGHT_IDX),
-    [SENSOR_MI0360] =
-        (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
-                | (1 << HFLIP_IDX) | (1 << VFLIP_IDX) | (1 << LIGHTFREQ_IDX)
-                | (1 << SHARPNESS_IDX)
-                | (1 << GAIN_IDX) | (1 << EXPOSURE_IDX)
-                | (1 << AUTOGAIN_IDX) | (1 << BACKLIGHT_IDX),
-    [SENSOR_MI1310_SOC] =
-        (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
-                | (1 << LIGHTFREQ_IDX) | (1 << SHARPNESS_IDX)
-                | (1 << GAIN_IDX) | (1 << EXPOSURE_IDX)
-                | (1 << AUTOGAIN_IDX) | (1 << BACKLIGHT_IDX),
-    [SENSOR_MI1320] =
-        (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
-                | (1 << LIGHTFREQ_IDX) | (1 << SHARPNESS_IDX)
-                | (1 << GAIN_IDX) | (1 << EXPOSURE_IDX)
-                | (1 << AUTOGAIN_IDX) | (1 << BACKLIGHT_IDX),
-    [SENSOR_MI1320_SOC] =
-        (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
-                | (1 << LIGHTFREQ_IDX) | (1 << SHARPNESS_IDX)
-                | (1 << GAIN_IDX) | (1 << EXPOSURE_IDX)
-                | (1 << AUTOGAIN_IDX) | (1 << BACKLIGHT_IDX),
-    [SENSOR_OV7660] =
-        (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
-                | (1 << LIGHTFREQ_IDX) | (1 << SHARPNESS_IDX)
-                | (1 << GAIN_IDX) | (1 << EXPOSURE_IDX)
-                | (1 << AUTOGAIN_IDX) | (1 << BACKLIGHT_IDX),
-    [SENSOR_OV7670] =
-        (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
-                | (1 << SHARPNESS_IDX)
-                | (1 << GAIN_IDX) | (1 << EXPOSURE_IDX)
-                | (1 << AUTOGAIN_IDX) | (1 << BACKLIGHT_IDX),
-    [SENSOR_PO1200] =
-        (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
-                | (1 << LIGHTFREQ_IDX)
-                | (1 << GAIN_IDX) | (1 << EXPOSURE_IDX)
-                | (1 << AUTOGAIN_IDX) | (1 << BACKLIGHT_IDX),
-    [SENSOR_PO3130NC] =
-        (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
-                | (1 << HFLIP_IDX) | (1 << VFLIP_IDX) | (1 << LIGHTFREQ_IDX)
-                | (1 << SHARPNESS_IDX)
-                | (1 << GAIN_IDX) | (1 << EXPOSURE_IDX)
-                | (1 << AUTOGAIN_IDX) | (1 << BACKLIGHT_IDX),
-    [SENSOR_POxxxx] =
-        (1 << HFLIP_IDX) | (1 << VFLIP_IDX) | (1 << LIGHTFREQ_IDX),
-};
 
 static const struct v4l2_pix_format vc0321_mode[] = {
         {320, 240, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
@@ -3405,18 +3151,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
             (id->idProduct == 0x0892 || id->idProduct == 0x0896))
                 sd->sensor = SENSOR_POxxxx;     /* no probe */
 
-        sd->brightness = BRIGHTNESS_DEF;
-        sd->contrast = CONTRAST_DEF;
-        sd->colors = COLOR_DEF;
-        sd->hflip = HFLIP_DEF;
-        sd->vflip = VFLIP_DEF;
-        sd->lightfreq = FREQ_DEF;
-        sd->sharpness = SHARPNESS_DEF;
-        sd->gain = GAIN_DEF;
-        sd->exposure = EXPOSURE_DEF;
-        sd->autogain = AUTOGAIN_DEF;
-        sd->backlight = BACKLIGHT_DEF;
-
         return 0;
 }
 
@@ -3512,7 +3246,6 @@ static int sd_init(struct gspca_dev *gspca_dev)
                 }
         }
         cam->npkt = npkt[sd->sensor];
-        gspca_dev->ctrl_dis = ctrl_dis[sd->sensor];
 
         if (sd->sensor == SENSOR_OV7670)
                 sd->flags |= FL_HFLIP | FL_VFLIP;
@@ -3534,14 +3267,11 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return gspca_dev->usb_err;
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u8 data;
 
-        if (gspca_dev->ctrl_dis & (1 << BRIGHTNESS_IDX))
-                return;
-        data = sd->brightness;
+        data = val;
         if (data >= 0x80)
                 data &= 0x7f;
         else
@@ -3549,36 +3279,27 @@ static void setbrightness(struct gspca_dev *gspca_dev)
         i2c_write(gspca_dev, 0x98, &data, 1);
 }
 
-static void setcontrast(struct gspca_dev *gspca_dev)
+static void setcontrast(struct gspca_dev *gspca_dev, u8 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        if (gspca_dev->ctrl_dis & (1 << CONTRAST_IDX))
-                return;
-        i2c_write(gspca_dev, 0x99, &sd->contrast, 1);
+        i2c_write(gspca_dev, 0x99, &val, 1);
 }
 
-static void setcolors(struct gspca_dev *gspca_dev)
+static void setcolors(struct gspca_dev *gspca_dev, u8 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u8 data;
 
-        if (gspca_dev->ctrl_dis & (1 << COLORS_IDX))
-                return;
-        data = sd->colors - (sd->colors >> 3) - 1;
+        data = val - (val >> 3) - 1;
         i2c_write(gspca_dev, 0x94, &data, 1);
-        i2c_write(gspca_dev, 0x95, &sd->colors, 1);
+        i2c_write(gspca_dev, 0x95, &val, 1);
 }
 
-static void sethvflip(struct gspca_dev *gspca_dev)
+static void sethvflip(struct gspca_dev *gspca_dev, bool hflip, bool vflip)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        u8 data[2], hflip, vflip;
+        u8 data[2];
 
-        hflip = sd->hflip;
         if (sd->flags & FL_HFLIP)
                 hflip = !hflip;
-        vflip = sd->vflip;
         if (sd->flags & FL_VFLIP)
                 vflip = !vflip;
         switch (sd->sensor) {
@@ -3610,7 +3331,7 @@ static void sethvflip(struct gspca_dev *gspca_dev)
         }
 }
 
-static void setlightfreq(struct gspca_dev *gspca_dev)
+static void setlightfreq(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         static const u8 (*ov7660_freq_tb[3])[4] =
@@ -3618,10 +3339,10 @@ static void setlightfreq(struct gspca_dev *gspca_dev)
 
         if (sd->sensor != SENSOR_OV7660)
                 return;
-        usb_exchange(gspca_dev, ov7660_freq_tb[sd->lightfreq]);
+        usb_exchange(gspca_dev, ov7660_freq_tb[val]);
 }
 
-static void setsharpness(struct gspca_dev *gspca_dev)
+static void setsharpness(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u8 data;
@@ -3630,51 +3351,41 @@ static void setsharpness(struct gspca_dev *gspca_dev)
         case SENSOR_PO1200:
                 data = 0;
                 i2c_write(gspca_dev, 0x03, &data, 1);
-                if (sd->sharpness < 0)
+                if (val < 0)
                         data = 0x6a;
                 else
-                        data = 0xb5 + sd->sharpness * 3;
+                        data = 0xb5 + val * 3;
                 i2c_write(gspca_dev, 0x61, &data, 1);
                 break;
         case SENSOR_POxxxx:
-                if (sd->sharpness < 0)
+                if (val < 0)
                         data = 0x7e;    /* def = max */
                 else
-                        data = 0x60 + sd->sharpness * 0x0f;
+                        data = 0x60 + val * 0x0f;
                 i2c_write(gspca_dev, 0x59, &data, 1);
                 break;
         }
 }
-static void setgain(struct gspca_dev *gspca_dev)
+static void setgain(struct gspca_dev *gspca_dev, u8 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        if (gspca_dev->ctrl_dis & (1 << GAIN_IDX))
-                return;
-        i2c_write(gspca_dev, 0x15, &sd->gain, 1);
+        i2c_write(gspca_dev, 0x15, &val, 1);
 }
 
-static void setexposure(struct gspca_dev *gspca_dev)
+static void setexposure(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u8 data;
 
-        if (gspca_dev->ctrl_dis & (1 << EXPOSURE_IDX))
-                return;
-        data = sd->exposure >> 8;
+        data = val >> 8;
         i2c_write(gspca_dev, 0x1a, &data, 1);
-        data = sd->exposure;
+        data = val;
         i2c_write(gspca_dev, 0x1b, &data, 1);
 }
 
-static void setautogain(struct gspca_dev *gspca_dev)
+static void setautogain(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         static const u8 data[2] = {0x28, 0x3c};
 
-        if (gspca_dev->ctrl_dis & (1 << AUTOGAIN_IDX))
-                return;
-        i2c_write(gspca_dev, 0xd1, &data[sd->autogain], 1);
+        i2c_write(gspca_dev, 0xd1, &data[val], 1);
 }
 
 static void setgamma(struct gspca_dev *gspca_dev)
@@ -3683,30 +3394,29 @@ static void setgamma(struct gspca_dev *gspca_dev)
         usb_exchange(gspca_dev, poxxxx_gamma);
 }
 
-static void setbacklight(struct gspca_dev *gspca_dev)
+static void setbacklight(struct gspca_dev *gspca_dev, s32 val)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
         u16 v;
         u8 data;
 
-        data = (sd->backlight << 4) | 0x0f;
+        data = (val << 4) | 0x0f;
         i2c_write(gspca_dev, 0xaa, &data, 1);
-        v = 613 + 12 * sd->backlight;
+        v = 613 + 12 * val;
         data = v >> 8;
         i2c_write(gspca_dev, 0xc4, &data, 1);
         data = v;
         i2c_write(gspca_dev, 0xc5, &data, 1);
-        v = 1093 - 12 * sd->backlight;
+        v = 1093 - 12 * val;
         data = v >> 8;
         i2c_write(gspca_dev, 0xc6, &data, 1);
         data = v;
         i2c_write(gspca_dev, 0xc7, &data, 1);
-        v = 342 + 9 * sd->backlight;
+        v = 342 + 9 * val;
         data = v >> 8;
         i2c_write(gspca_dev, 0xc8, &data, 1);
         data = v;
         i2c_write(gspca_dev, 0xc9, &data, 1);
-        v = 702 - 9 * sd->backlight;
+        v = 702 - 9 * val;
         data = v >> 8;
         i2c_write(gspca_dev, 0xca, &data, 1);
         data = v;
@@ -3833,14 +3543,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
 /*      case SENSOR_POxxxx: */
                 usb_exchange(gspca_dev, poxxxx_init_common);
                 setgamma(gspca_dev);
-                setbacklight(gspca_dev);
-                setbrightness(gspca_dev);
-                setcontrast(gspca_dev);
-                setcolors(gspca_dev);
-                setsharpness(gspca_dev);
-                setautogain(gspca_dev);
-                setexposure(gspca_dev);
-                setgain(gspca_dev);
                 usb_exchange(gspca_dev, poxxxx_init_start_3);
                 if (mode)
                         init = poxxxx_initQVGA;
@@ -3873,8 +3575,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
                         break;
                 }
                 msleep(100);
-                sethvflip(gspca_dev);
-                setlightfreq(gspca_dev);
         }
         switch (sd->sensor) {
         case SENSOR_OV7670:
@@ -3960,233 +3660,152 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
 }
 
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->brightness = val;
-        if (gspca_dev->streaming)
-                setbrightness(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->brightness;
-        return 0;
-}
-
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->contrast = val;
-        if (gspca_dev->streaming)
-                setcontrast(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->contrast;
-        return 0;
-}
-
-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->colors = val;
-        if (gspca_dev->streaming)
-                setcolors(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->colors;
-        return 0;
-}
-
-static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->hflip = val;
-        if (gspca_dev->streaming)
-                sethvflip(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
-static int sd_gethflip(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->hflip;
-        return 0;
-}
-
-static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->vflip = val;
-        if (gspca_dev->streaming)
-                sethvflip(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
-static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
 
-        *val = sd->vflip;
-        return 0;
-}
+        gspca_dev->usb_err = 0;
 
-static int sd_setfreq(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->lightfreq = val;
-        if (gspca_dev->streaming)
-                setlightfreq(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
-static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->lightfreq;
-        return 0;
-}
-
-static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->sharpness = val;
-        if (gspca_dev->streaming)
-                setsharpness(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
-static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->sharpness;
-        return 0;
-}
-
-static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->gain = val;
-        if (gspca_dev->streaming)
-                setgain(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
-static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->gain;
-        return 0;
-}
-
-static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->exposure = val;
-        if (gspca_dev->streaming)
-                setexposure(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
-static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->exposure;
-        return 0;
-}
-
-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->autogain = val;
-        if (gspca_dev->streaming)
-                setautogain(gspca_dev);
+        if (!gspca_dev->streaming && ctrl->id != V4L2_CID_POWER_LINE_FREQUENCY)
+                return 0;
 
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                setbrightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                setcontrast(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_SATURATION:
+                setcolors(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_HFLIP:
+                sethvflip(gspca_dev, sd->hflip->val, sd->vflip->val);
+                break;
+        case V4L2_CID_SHARPNESS:
+                setsharpness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_AUTOGAIN:
+                setautogain(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_GAIN:
+                setgain(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_EXPOSURE:
+                setexposure(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_BACKLIGHT_COMPENSATION:
+                setbacklight(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_POWER_LINE_FREQUENCY:
+                setlightfreq(gspca_dev, ctrl->val);
+                break;
+        }
         return gspca_dev->usb_err;
 }
 
-static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->autogain;
-        return 0;
-}
-
-static int sd_setbacklight(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->backlight = val;
-        if (gspca_dev->streaming)
-                setbacklight(gspca_dev);
-
-        return gspca_dev->usb_err;
-}
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
 
-static int sd_getbacklight(struct gspca_dev *gspca_dev, __s32 *val)
+static int sd_init_controls(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        struct sd *sd = (struct sd *)gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+        bool has_brightness = false;
+        bool has_contrast = false;
+        bool has_sat = false;
+        bool has_hvflip = false;
+        bool has_freq = false;
+        bool has_backlight = false;
+        bool has_exposure = false;
+        bool has_autogain = false;
+        bool has_gain = false;
+        bool has_sharpness = false;
 
-        *val = sd->backlight;
-        return 0;
-}
-
-static int sd_querymenu(struct gspca_dev *gspca_dev,
-                        struct v4l2_querymenu *menu)
-{
-        static const char *freq_nm[3] = {"NoFliker", "50 Hz", "60 Hz"};
+        switch (sd->sensor) {
+        case SENSOR_HV7131R:
+        case SENSOR_MI0360:
+        case SENSOR_PO3130NC:
+                break;
+        case SENSOR_MI1310_SOC:
+        case SENSOR_MI1320:
+        case SENSOR_MI1320_SOC:
+        case SENSOR_OV7660:
+                has_hvflip = true;
+                break;
+        case SENSOR_OV7670:
+                has_hvflip = has_freq = true;
+                break;
+        case SENSOR_PO1200:
+                has_hvflip = has_sharpness = true;
+                break;
+        case SENSOR_POxxxx:
+                has_brightness = has_contrast = has_sat = has_backlight =
+                        has_exposure = has_autogain = has_gain =
+                        has_sharpness = true;
+                break;
+        }
 
-        switch (menu->id) {
-        case V4L2_CID_POWER_LINE_FREQUENCY:
-                if (menu->index >= ARRAY_SIZE(freq_nm))
-                        break;
-                strcpy((char *) menu->name, freq_nm[menu->index]);
-                return 0;
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 8);
+        if (has_brightness)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 255, 1, 128);
+        if (has_contrast)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, 255, 1, 127);
+        if (has_sat)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SATURATION, 1, 127, 1, 63);
+        if (has_hvflip) {
+                sd->hflip = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_HFLIP, 0, 1, 1, 0);
+                sd->vflip = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_VFLIP, 0, 1, 1, 0);
         }
-        return -EINVAL;
+        if (has_sharpness)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SHARPNESS, -1, 2, 1, -1);
+        if (has_freq)
+                v4l2_ctrl_new_std_menu(hdl, &sd_ctrl_ops,
+                        V4L2_CID_POWER_LINE_FREQUENCY,
+                        V4L2_CID_POWER_LINE_FREQUENCY_60HZ, 0,
+                        V4L2_CID_POWER_LINE_FREQUENCY_50HZ);
+        if (has_autogain)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+        if (has_gain)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_GAIN, 0, 78, 1, 0);
+        if (has_exposure)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_EXPOSURE, 0, 4095, 1, 450);
+        if (has_backlight)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BACKLIGHT_COMPENSATION, 0, 15, 1, 15);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+        if (sd->hflip)
+                v4l2_ctrl_cluster(2, &sd->hflip);
+        return 0;
 }
 
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
+        .init_controls = sd_init_controls,
         .config = sd_config,
         .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
         .stop0 = sd_stop0,
         .pkt_scan = sd_pkt_scan,
-        .querymenu = sd_querymenu,
 };
 
 /* -- module initialisation -- */
@@ -4227,6 +3846,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/vicam.c b/drivers/media/video/gspca/vicam.c
index 15a30f7a4b2a..b1a64b912666 100644
--- a/drivers/media/video/gspca/vicam.c
+++ b/drivers/media/video/gspca/vicam.c
@@ -44,17 +44,10 @@ MODULE_DESCRIPTION("GSPCA ViCam USB Camera Driver");
 MODULE_LICENSE("GPL");
 MODULE_FIRMWARE(VICAM_FIRMWARE);
 
-enum e_ctrl {
-        GAIN,
-        EXPOSURE,
-        NCTRL           /* number of controls */
-};
-
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
         struct work_struct work_struct;
         struct workqueue_struct *work_thread;
-        struct gspca_ctrl ctrls[NCTRL];
 };
 
 /* The vicam sensor has a resolution of 512 x 244, with I believe square
@@ -86,31 +79,6 @@ static struct v4l2_pix_format vicam_mode[] = {
                 .colorspace = V4L2_COLORSPACE_SRGB,},
 };
 
-static const struct ctrl sd_ctrls[] = {
-[GAIN] = {
-            {
-                .id      = V4L2_CID_GAIN,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Gain",
-                .minimum = 0,
-                .maximum = 255,
-                .step    = 1,
-                .default_value = 200,
-            },
-        },
-[EXPOSURE] = {
-            {
-                .id      = V4L2_CID_EXPOSURE,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Exposure",
-                .minimum = 0,
-                .maximum = 2047,
-                .step    = 1,
-                .default_value = 256,
-            },
-        },
-};
-
 static int vicam_control_msg(struct gspca_dev *gspca_dev, u8 request,
         u16 value, u16 index, u8 *data, u16 len)
 {
@@ -146,12 +114,13 @@ static int vicam_set_camera_power(struct gspca_dev *gspca_dev, int state)
  */
 static int vicam_read_frame(struct gspca_dev *gspca_dev, u8 *data, int size)
 {
-        struct sd *sd = (struct sd *)gspca_dev;
         int ret, unscaled_height, act_len = 0;
         u8 *req_data = gspca_dev->usb_buf;
+        s32 expo = v4l2_ctrl_g_ctrl(gspca_dev->exposure);
+        s32 gain = v4l2_ctrl_g_ctrl(gspca_dev->gain);
 
         memset(req_data, 0, 16);
-        req_data[0] = sd->ctrls[GAIN].val;
+        req_data[0] = gain;
         if (gspca_dev->width == 256)
                 req_data[1] |= 0x01; /* low nibble x-scale */
         if (gspca_dev->height <= 122) {
@@ -167,9 +136,9 @@ static int vicam_read_frame(struct gspca_dev *gspca_dev, u8 *data, int size)
         else /* Up to 244 lines with req_data[3] == 0x08 */
                 req_data[3] = 0x08; /* vend? */
 
-        if (sd->ctrls[EXPOSURE].val < 256) {
+        if (expo < 256) {
                 /* Frame rate maxed out, use partial frame expo time */
-                req_data[4] = 255 - sd->ctrls[EXPOSURE].val;
+                req_data[4] = 255 - expo;
                 req_data[5] = 0x00;
                 req_data[6] = 0x00;
                 req_data[7] = 0x01;
@@ -177,8 +146,8 @@ static int vicam_read_frame(struct gspca_dev *gspca_dev, u8 *data, int size)
                 /* Modify frame rate */
                 req_data[4] = 0x00;
                 req_data[5] = 0x00;
-                req_data[6] = sd->ctrls[EXPOSURE].val & 0xFF;
-                req_data[7] = sd->ctrls[EXPOSURE].val >> 8;
+                req_data[6] = expo & 0xFF;
+                req_data[7] = expo >> 8;
         }
         req_data[8] = ((244 - unscaled_height) / 2) & ~0x01; /* vstart */
         /* bytes 9-15 do not seem to affect exposure or image quality */
@@ -260,7 +229,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         cam->bulk_size = 64;
         cam->cam_mode = vicam_mode;
         cam->nmodes = ARRAY_SIZE(vicam_mode);
-        cam->ctrls = sd->ctrls;
 
         INIT_WORK(&sd->work_struct, vicam_dostream);
 
@@ -335,6 +303,24 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
                 vicam_set_camera_power(gspca_dev, 0);
 }
 
+static int sd_init_controls(struct gspca_dev *gspca_dev)
+{
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 2);
+        gspca_dev->exposure = v4l2_ctrl_new_std(hdl, NULL,
+                        V4L2_CID_EXPOSURE, 0, 2047, 1, 256);
+        gspca_dev->gain = v4l2_ctrl_new_std(hdl, NULL,
+                        V4L2_CID_GAIN, 0, 255, 1, 200);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+        return 0;
+}
+
 /* Table of supported USB devices */
 static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x04c1, 0x009d)},
@@ -347,10 +333,9 @@ MODULE_DEVICE_TABLE(usb, device_table);
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name   = MODULE_NAME,
-        .ctrls  = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init   = sd_init,
+        .init_controls = sd_init_controls,
         .start  = sd_start,
         .stop0  = sd_stop0,
 };
@@ -373,6 +358,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume  = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/gspca/w996Xcf.c b/drivers/media/video/gspca/w996Xcf.c
index 27d2cef0692a..9e3a909e0a00 100644
--- a/drivers/media/video/gspca/w996Xcf.c
+++ b/drivers/media/video/gspca/w996Xcf.c
@@ -404,9 +404,14 @@ static void w9968cf_set_crop_window(struct sd *sd)
         }
 
         if (sd->sensor == SEN_OV7620) {
-                /* Sigh, this is dependend on the clock / framerate changes
-                   made by the frequency control, sick. */
-                if (sd->ctrls[FREQ].val == 1) {
+                /*
+                 * Sigh, this is dependend on the clock / framerate changes
+                 * made by the frequency control, sick.
+                 *
+                 * Note we cannot use v4l2_ctrl_g_ctrl here, as we get called
+                 * from ov519.c:setfreq() with the ctrl lock held!
+                 */
+                if (sd->freq->val == 1) {
                         start_cropx = 277;
                         start_cropy = 37;
                 } else {
@@ -474,8 +479,9 @@ static void w9968cf_mode_init_regs(struct sd *sd)
                 /* We may get called multiple times (usb isoc bw negotiat.) */
                 jpeg_define(sd->jpeg_hdr, sd->gspca_dev.height,
                             sd->gspca_dev.width, 0x22); /* JPEG 420 */
-                jpeg_set_qual(sd->jpeg_hdr, sd->quality);
+                jpeg_set_qual(sd->jpeg_hdr, v4l2_ctrl_g_ctrl(sd->jpegqual));
                 w9968cf_upload_quantizationtables(sd);
+                v4l2_ctrl_grab(sd->jpegqual, true);
         }
 
         /* Video Capture Control Register */
@@ -514,6 +520,7 @@ static void w9968cf_mode_init_regs(struct sd *sd)
 
 static void w9968cf_stop0(struct sd *sd)
 {
+        v4l2_ctrl_grab(sd->jpegqual, false);
         reg_w(sd, 0x39, 0x0000); /* disable JPEG encoder */
         reg_w(sd, 0x16, 0x0000); /* stop video capture */
 }
diff --git a/drivers/media/video/gspca/xirlink_cit.c b/drivers/media/video/gspca/xirlink_cit.c
index ecada178bceb..13b8d395d210 100644
--- a/drivers/media/video/gspca/xirlink_cit.c
+++ b/drivers/media/video/gspca/xirlink_cit.c
@@ -53,6 +53,7 @@ MODULE_PARM_DESC(rca_input,
 /* specific webcam descriptor */
 struct sd {
         struct gspca_dev gspca_dev;             /* !! must be the first item */
+        struct v4l2_ctrl *lighting;
         u8 model;
 #define CIT_MODEL0 0 /* bcd version 0.01 cams ie the xvp-500 */
 #define CIT_MODEL1 1 /* The model 1 - 4 nomenclature comes from the old */
@@ -65,127 +66,10 @@ struct sd {
         u8 stop_on_control_change;
         u8 sof_read;
         u8 sof_len;
-        u8 contrast;
-        u8 brightness;
-        u8 hue;
-        u8 sharpness;
-        u8 lighting;
-        u8 hflip;
 };
 
-/* V4L2 controls supported by the driver */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_sethue(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_gethue(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setlighting(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getlighting(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_gethflip(struct gspca_dev *gspca_dev, __s32 *val);
 static void sd_stop0(struct gspca_dev *gspca_dev);
 
-static const struct ctrl sd_ctrls[] = {
-#define SD_BRIGHTNESS 0
-        {
-            {
-                .id      = V4L2_CID_BRIGHTNESS,
-                .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Brightness",
-                .minimum = 0,
-                .maximum = 63,
-                .step = 1,
-#define BRIGHTNESS_DEFAULT 32
-                .default_value = BRIGHTNESS_DEFAULT,
-                .flags = 0,
-            },
-            .set = sd_setbrightness,
-            .get = sd_getbrightness,
-        },
-#define SD_CONTRAST 1
-        {
-            {
-                .id = V4L2_CID_CONTRAST,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "contrast",
-                .minimum = 0,
-                .maximum = 20,
-                .step = 1,
-#define CONTRAST_DEFAULT 10
-                .default_value = CONTRAST_DEFAULT,
-                .flags = 0,
-            },
-            .set = sd_setcontrast,
-            .get = sd_getcontrast,
-        },
-#define SD_HUE 2
-        {
-            {
-                .id     = V4L2_CID_HUE,
-                .type   = V4L2_CTRL_TYPE_INTEGER,
-                .name   = "Hue",
-                .minimum = 0,
-                .maximum = 127,
-                .step   = 1,
-#define HUE_DEFAULT 63
-                .default_value = HUE_DEFAULT,
-                .flags = 0,
-            },
-            .set = sd_sethue,
-            .get = sd_gethue,
-        },
-#define SD_SHARPNESS 3
-        {
-            {
-                .id = V4L2_CID_SHARPNESS,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Sharpness",
-                .minimum = 0,
-                .maximum = 6,
-                .step = 1,
-#define SHARPNESS_DEFAULT 3
-                .default_value = SHARPNESS_DEFAULT,
-                .flags = 0,
-            },
-            .set = sd_setsharpness,
-            .get = sd_getsharpness,
-        },
-#define SD_LIGHTING 4
-        {
-            {
-                .id = V4L2_CID_BACKLIGHT_COMPENSATION,
-                .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "Lighting",
-                .minimum = 0,
-                .maximum = 2,
-                .step = 1,
-#define LIGHTING_DEFAULT 1
-                .default_value = LIGHTING_DEFAULT,
-                .flags = 0,
-            },
-            .set = sd_setlighting,
-            .get = sd_getlighting,
-        },
-#define SD_HFLIP 5
-        {
-            {
-                .id      = V4L2_CID_HFLIP,
-                .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                .name    = "Mirror",
-                .minimum = 0,
-                .maximum = 1,
-                .step    = 1,
-#define HFLIP_DEFAULT 0
-                .default_value = HFLIP_DEFAULT,
-            },
-            .set = sd_sethflip,
-            .get = sd_gethflip,
-        },
-};
-
 static const struct v4l2_pix_format cif_yuv_mode[] = {
         {176, 144, V4L2_PIX_FMT_CIT_YYVYUY, V4L2_FIELD_NONE,
                 .bytesperline = 176,
@@ -995,56 +879,36 @@ static int sd_config(struct gspca_dev *gspca_dev,
         case CIT_MODEL0:
                 cam->cam_mode = model0_mode;
                 cam->nmodes = ARRAY_SIZE(model0_mode);
-                gspca_dev->ctrl_dis = ~((1 << SD_CONTRAST) | (1 << SD_HFLIP));
                 sd->sof_len = 4;
                 break;
         case CIT_MODEL1:
                 cam->cam_mode = cif_yuv_mode;
                 cam->nmodes = ARRAY_SIZE(cif_yuv_mode);
-                gspca_dev->ctrl_dis = (1 << SD_HUE) | (1 << SD_HFLIP);
                 sd->sof_len = 4;
                 break;
         case CIT_MODEL2:
                 cam->cam_mode = model2_mode + 1; /* no 160x120 */
                 cam->nmodes = 3;
-                gspca_dev->ctrl_dis = (1 << SD_CONTRAST) |
-                                      (1 << SD_SHARPNESS) |
-                                      (1 << SD_HFLIP);
                 break;
         case CIT_MODEL3:
                 cam->cam_mode = vga_yuv_mode;
                 cam->nmodes = ARRAY_SIZE(vga_yuv_mode);
-                gspca_dev->ctrl_dis = (1 << SD_HUE) |
-                                      (1 << SD_LIGHTING) |
-                                      (1 << SD_HFLIP);
                 sd->stop_on_control_change = 1;
                 sd->sof_len = 4;
                 break;
         case CIT_MODEL4:
                 cam->cam_mode = model2_mode;
                 cam->nmodes = ARRAY_SIZE(model2_mode);
-                gspca_dev->ctrl_dis = (1 << SD_CONTRAST) |
-                                      (1 << SD_SHARPNESS) |
-                                      (1 << SD_LIGHTING) |
-                                      (1 << SD_HFLIP);
                 break;
         case CIT_IBM_NETCAM_PRO:
                 cam->cam_mode = vga_yuv_mode;
                 cam->nmodes = 2; /* no 640 x 480 */
                 cam->input_flags = V4L2_IN_ST_VFLIP;
-                gspca_dev->ctrl_dis = ~(1 << SD_CONTRAST);
                 sd->stop_on_control_change = 1;
                 sd->sof_len = 4;
                 break;
         }
 
-        sd->brightness = BRIGHTNESS_DEFAULT;
-        sd->contrast = CONTRAST_DEFAULT;
-        sd->hue = HUE_DEFAULT;
-        sd->sharpness = SHARPNESS_DEFAULT;
-        sd->lighting = LIGHTING_DEFAULT;
-        sd->hflip = HFLIP_DEFAULT;
-
         return 0;
 }
 
@@ -1287,7 +1151,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static int cit_set_brightness(struct gspca_dev *gspca_dev)
+static int cit_set_brightness(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         int i;
@@ -1299,19 +1163,19 @@ static int cit_set_brightness(struct gspca_dev *gspca_dev)
                 break;
         case CIT_MODEL1:
                 /* Model 1: Brightness range 0 - 63 */
-                cit_Packet_Format1(gspca_dev, 0x0031, sd->brightness);
-                cit_Packet_Format1(gspca_dev, 0x0032, sd->brightness);
-                cit_Packet_Format1(gspca_dev, 0x0033, sd->brightness);
+                cit_Packet_Format1(gspca_dev, 0x0031, val);
+                cit_Packet_Format1(gspca_dev, 0x0032, val);
+                cit_Packet_Format1(gspca_dev, 0x0033, val);
                 break;
         case CIT_MODEL2:
                 /* Model 2: Brightness range 0x60 - 0xee */
                 /* Scale 0 - 63 to 0x60 - 0xee */
-                i = 0x60 + sd->brightness * 2254 / 1000;
+                i = 0x60 + val * 2254 / 1000;
                 cit_model2_Packet1(gspca_dev, 0x001a, i);
                 break;
         case CIT_MODEL3:
                 /* Model 3: Brightness range 'i' in [0x0C..0x3F] */
-                i = sd->brightness;
+                i = val;
                 if (i < 0x0c)
                         i = 0x0c;
                 cit_model3_Packet1(gspca_dev, 0x0036, i);
@@ -1319,7 +1183,7 @@ static int cit_set_brightness(struct gspca_dev *gspca_dev)
         case CIT_MODEL4:
                 /* Model 4: Brightness range 'i' in [0x04..0xb4] */
                 /* Scale 0 - 63 to 0x04 - 0xb4 */
-                i = 0x04 + sd->brightness * 2794 / 1000;
+                i = 0x04 + val * 2794 / 1000;
                 cit_model4_BrightnessPacket(gspca_dev, i);
                 break;
         }
@@ -1327,7 +1191,7 @@ static int cit_set_brightness(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static int cit_set_contrast(struct gspca_dev *gspca_dev)
+static int cit_set_contrast(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
@@ -1335,16 +1199,16 @@ static int cit_set_contrast(struct gspca_dev *gspca_dev)
         case CIT_MODEL0: {
                 int i;
                 /* gain 0-15, 0-20 -> 0-15 */
-                i = sd->contrast * 1000 / 1333;
+                i = val * 1000 / 1333;
                 cit_write_reg(gspca_dev, i, 0x0422);
                 /* gain 0-31, may not be lower then 0x0422, 0-20 -> 0-31 */
-                i = sd->contrast * 2000 / 1333;
+                i = val * 2000 / 1333;
                 cit_write_reg(gspca_dev, i, 0x0423);
                 /* gain 0-127, may not be lower then 0x0423, 0-20 -> 0-63  */
-                i = sd->contrast * 4000 / 1333;
+                i = val * 4000 / 1333;
                 cit_write_reg(gspca_dev, i, 0x0424);
                 /* gain 0-127, may not be lower then 0x0424, , 0-20 -> 0-127 */
-                i = sd->contrast * 8000 / 1333;
+                i = val * 8000 / 1333;
                 cit_write_reg(gspca_dev, i, 0x0425);
                 break;
         }
@@ -1355,7 +1219,7 @@ static int cit_set_contrast(struct gspca_dev *gspca_dev)
         case CIT_MODEL1:
         {
                 /* Scale 0 - 20 to 15 - 0 */
-                int i, new_contrast = (20 - sd->contrast) * 1000 / 1333;
+                int i, new_contrast = (20 - val) * 1000 / 1333;
                 for (i = 0; i < cit_model1_ntries; i++) {
                         cit_Packet_Format1(gspca_dev, 0x0014, new_contrast);
                         cit_send_FF_04_02(gspca_dev);
@@ -1377,20 +1241,20 @@ static int cit_set_contrast(struct gspca_dev *gspca_dev)
                         { 0x01, 0x0e, 0x16 },
                         { 0x01, 0x10, 0x16 }    /* Maximum */
                 };
-                int i = sd->contrast / 3;
+                int i = val / 3;
                 cit_model3_Packet1(gspca_dev, 0x0067, cv[i].cv1);
                 cit_model3_Packet1(gspca_dev, 0x005b, cv[i].cv2);
                 cit_model3_Packet1(gspca_dev, 0x005c, cv[i].cv3);
                 break;
         }
         case CIT_IBM_NETCAM_PRO:
-                cit_model3_Packet1(gspca_dev, 0x005b, sd->contrast + 1);
+                cit_model3_Packet1(gspca_dev, 0x005b, val + 1);
                 break;
         }
         return 0;
 }
 
-static int cit_set_hue(struct gspca_dev *gspca_dev)
+static int cit_set_hue(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
@@ -1401,7 +1265,7 @@ static int cit_set_hue(struct gspca_dev *gspca_dev)
                 /* No hue control for these models */
                 break;
         case CIT_MODEL2:
-                cit_model2_Packet1(gspca_dev, 0x0024, sd->hue);
+                cit_model2_Packet1(gspca_dev, 0x0024, val);
                 /* cit_model2_Packet1(gspca_dev, 0x0020, sat); */
                 break;
         case CIT_MODEL3: {
@@ -1409,7 +1273,7 @@ static int cit_set_hue(struct gspca_dev *gspca_dev)
                 /* TESTME according to the ibmcam driver this does not work */
                 if (0) {
                         /* Scale 0 - 127 to 0x05 - 0x37 */
-                        int i = 0x05 + sd->hue * 1000 / 2540;
+                        int i = 0x05 + val * 1000 / 2540;
                         cit_model3_Packet1(gspca_dev, 0x007e, i);
                 }
                 break;
@@ -1435,14 +1299,14 @@ static int cit_set_hue(struct gspca_dev *gspca_dev)
                 cit_write_reg(gspca_dev,    160, 0x012e);  /* Red gain */
                 cit_write_reg(gspca_dev,    160, 0x0130);  /* Blue gain */
                 cit_write_reg(gspca_dev, 0x8a28, 0x0124);
-                cit_write_reg(gspca_dev, sd->hue, 0x012d); /* Hue */
+                cit_write_reg(gspca_dev, val, 0x012d); /* Hue */
                 cit_write_reg(gspca_dev, 0xf545, 0x0124);
                 break;
         }
         return 0;
 }
 
-static int cit_set_sharpness(struct gspca_dev *gspca_dev)
+static int cit_set_sharpness(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
@@ -1459,7 +1323,7 @@ static int cit_set_sharpness(struct gspca_dev *gspca_dev)
                         0x11, 0x13, 0x16, 0x18, 0x1a, 0x8, 0x0a };
 
                 for (i = 0; i < cit_model1_ntries; i++)
-                        cit_PacketFormat2(gspca_dev, 0x0013, sa[sd->sharpness]);
+                        cit_PacketFormat2(gspca_dev, 0x0013, sa[val]);
                 break;
         }
         case CIT_MODEL3:
@@ -1482,10 +1346,10 @@ static int cit_set_sharpness(struct gspca_dev *gspca_dev)
                         { 0x03, 0x06, 0x05, 0x14 },
                         { 0x03, 0x07, 0x05, 0x14 }      /* Sharpest */
                 };
-                cit_model3_Packet1(gspca_dev, 0x0060, sv[sd->sharpness].sv1);
-                cit_model3_Packet1(gspca_dev, 0x0061, sv[sd->sharpness].sv2);
-                cit_model3_Packet1(gspca_dev, 0x0062, sv[sd->sharpness].sv3);
-                cit_model3_Packet1(gspca_dev, 0x0063, sv[sd->sharpness].sv4);
+                cit_model3_Packet1(gspca_dev, 0x0060, sv[val].sv1);
+                cit_model3_Packet1(gspca_dev, 0x0061, sv[val].sv2);
+                cit_model3_Packet1(gspca_dev, 0x0062, sv[val].sv3);
+                cit_model3_Packet1(gspca_dev, 0x0063, sv[val].sv4);
                 break;
         }
         }
@@ -1510,7 +1374,7 @@ static int cit_set_sharpness(struct gspca_dev *gspca_dev)
  * 1/5/00   Created.
  * 2/20/00  Added support for Model 2 cameras.
  */
-static void cit_set_lighting(struct gspca_dev *gspca_dev)
+static void cit_set_lighting(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
@@ -1524,19 +1388,19 @@ static void cit_set_lighting(struct gspca_dev *gspca_dev)
         case CIT_MODEL1: {
                 int i;
                 for (i = 0; i < cit_model1_ntries; i++)
-                        cit_Packet_Format1(gspca_dev, 0x0027, sd->lighting);
+                        cit_Packet_Format1(gspca_dev, 0x0027, val);
                 break;
         }
         }
 }
 
-static void cit_set_hflip(struct gspca_dev *gspca_dev)
+static void cit_set_hflip(struct gspca_dev *gspca_dev, s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
         switch (sd->model) {
         case CIT_MODEL0:
-                if (sd->hflip)
+                if (val)
                         cit_write_reg(gspca_dev, 0x0020, 0x0115);
                 else
                         cit_write_reg(gspca_dev, 0x0040, 0x0115);
@@ -1831,7 +1695,8 @@ static int cit_start_model1(struct gspca_dev *gspca_dev)
                         cit_PacketFormat2(gspca_dev, 0x13, 0x1a);
 
                 /* Default lighting conditions */
-                cit_Packet_Format1(gspca_dev, 0x0027, sd->lighting);
+                cit_Packet_Format1(gspca_dev, 0x0027,
+                                   v4l2_ctrl_g_ctrl(sd->lighting));
         }
 
         /* Assorted init */
@@ -2049,9 +1914,10 @@ static int cit_start_model2(struct gspca_dev *gspca_dev)
                 break;
         }
 
-        /* FIXME this cannot be changed while streaming, so we
-           should report a grabbed flag for this control. */
-        cit_model2_Packet1(gspca_dev, 0x0028, sd->lighting);
+        cit_model2_Packet1(gspca_dev, 0x0028, v4l2_ctrl_g_ctrl(sd->lighting));
+        /* model2 cannot change the backlight compensation while streaming */
+        v4l2_ctrl_grab(sd->lighting, true);
+
         /* color balance rg2 */
         cit_model2_Packet1(gspca_dev, 0x001e, 0x002f);
         /* saturation */
@@ -2755,13 +2621,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 break;
         }
 
-        cit_set_brightness(gspca_dev);
-        cit_set_contrast(gspca_dev);
-        cit_set_hue(gspca_dev);
-        cit_set_sharpness(gspca_dev);
-        cit_set_lighting(gspca_dev);
-        cit_set_hflip(gspca_dev);
-
         /* Program max isoc packet size */
         cit_write_reg(gspca_dev, packet_size >> 8, 0x0106);
         cit_write_reg(gspca_dev, packet_size & 0xff, 0x0107);
@@ -2857,6 +2716,8 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
                 cit_write_reg(gspca_dev, 0x81, 0x0100); /* LED Off */
                 break;
         case CIT_MODEL2:
+                v4l2_ctrl_grab(sd->lighting, false);
+                /* Fall through! */
         case CIT_MODEL4:
                 cit_model2_Packet1(gspca_dev, 0x0030, 0x0004);
 
@@ -3055,152 +2916,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
 }
 
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->brightness = val;
-        if (gspca_dev->streaming) {
-                if (sd->stop_on_control_change)
-                        sd_stopN(gspca_dev);
-                cit_set_brightness(gspca_dev);
-                if (sd->stop_on_control_change)
-                        cit_restart_stream(gspca_dev);
-        }
-
-        return 0;
-}
-
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->brightness;
-
-        return 0;
-}
-
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->contrast = val;
-        if (gspca_dev->streaming) {
-                if (sd->stop_on_control_change)
-                        sd_stopN(gspca_dev);
-                cit_set_contrast(gspca_dev);
-                if (sd->stop_on_control_change)
-                        cit_restart_stream(gspca_dev);
-        }
-
-        return 0;
-}
-
-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->contrast;
-
-        return 0;
-}
-
-static int sd_sethue(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->hue = val;
-        if (gspca_dev->streaming) {
-                if (sd->stop_on_control_change)
-                        sd_stopN(gspca_dev);
-                cit_set_hue(gspca_dev);
-                if (sd->stop_on_control_change)
-                        cit_restart_stream(gspca_dev);
-        }
-        return 0;
-}
-
-static int sd_gethue(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->hue;
-
-        return 0;
-}
-
-static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->sharpness = val;
-        if (gspca_dev->streaming) {
-                if (sd->stop_on_control_change)
-                        sd_stopN(gspca_dev);
-                cit_set_sharpness(gspca_dev);
-                if (sd->stop_on_control_change)
-                        cit_restart_stream(gspca_dev);
-        }
-        return 0;
-}
-
-static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->sharpness;
-
-        return 0;
-}
-
-static int sd_setlighting(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->lighting = val;
-        if (gspca_dev->streaming) {
-                if (sd->stop_on_control_change)
-                        sd_stopN(gspca_dev);
-                cit_set_lighting(gspca_dev);
-                if (sd->stop_on_control_change)
-                        cit_restart_stream(gspca_dev);
-        }
-        return 0;
-}
-
-static int sd_getlighting(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->lighting;
-
-        return 0;
-}
-
-static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->hflip = val;
-        if (gspca_dev->streaming) {
-                if (sd->stop_on_control_change)
-                        sd_stopN(gspca_dev);
-                cit_set_hflip(gspca_dev);
-                if (sd->stop_on_control_change)
-                        cit_restart_stream(gspca_dev);
-        }
-        return 0;
-}
-
-static int sd_gethflip(struct gspca_dev *gspca_dev, __s32 *val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        *val = sd->hflip;
-
-        return 0;
-}
-
 #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
 static void cit_check_button(struct gspca_dev *gspca_dev)
 {
@@ -3234,13 +2949,117 @@ static void cit_check_button(struct gspca_dev *gspca_dev)
 }
 #endif
 
+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct gspca_dev *gspca_dev =
+                container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
+        struct sd *sd = (struct sd *)gspca_dev;
+
+        gspca_dev->usb_err = 0;
+
+        if (!gspca_dev->streaming)
+                return 0;
+
+        if (sd->stop_on_control_change)
+                sd_stopN(gspca_dev);
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                cit_set_brightness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                cit_set_contrast(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_HUE:
+                cit_set_hue(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_HFLIP:
+                cit_set_hflip(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_SHARPNESS:
+                cit_set_sharpness(gspca_dev, ctrl->val);
+                break;
+        case V4L2_CID_BACKLIGHT_COMPENSATION:
+                cit_set_lighting(gspca_dev, ctrl->val);
+                break;
+        }
+        if (sd->stop_on_control_change)
+                cit_restart_stream(gspca_dev);
+        return gspca_dev->usb_err;
+}
+
+static const struct v4l2_ctrl_ops sd_ctrl_ops = {
+        .s_ctrl = sd_s_ctrl,
+};
+
+static int sd_init_controls(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *)gspca_dev;
+        struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
+        bool has_brightness;
+        bool has_contrast;
+        bool has_hue;
+        bool has_sharpness;
+        bool has_lighting;
+        bool has_hflip;
+
+        has_brightness = has_contrast = has_hue =
+                has_sharpness = has_hflip = has_lighting = false;
+        switch (sd->model) {
+        case CIT_MODEL0:
+                has_contrast = has_hflip = true;
+                break;
+        case CIT_MODEL1:
+                has_brightness = has_contrast =
+                        has_sharpness = has_lighting = true;
+                break;
+        case CIT_MODEL2:
+                has_brightness = has_hue = has_lighting = true;
+                break;
+        case CIT_MODEL3:
+                has_brightness = has_contrast = has_sharpness = true;
+                break;
+        case CIT_MODEL4:
+                has_brightness = has_hue = true;
+                break;
+        case CIT_IBM_NETCAM_PRO:
+                has_brightness = has_hue =
+                        has_sharpness = has_hflip = has_lighting = true;
+                break;
+        }
+        gspca_dev->vdev.ctrl_handler = hdl;
+        v4l2_ctrl_handler_init(hdl, 5);
+        if (has_brightness)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 63, 1, 32);
+        if (has_contrast)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, 20, 1, 10);
+        if (has_hue)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_HUE, 0, 127, 1, 63);
+        if (has_sharpness)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_SHARPNESS, 0, 6, 1, 3);
+        if (has_lighting)
+                sd->lighting = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_BACKLIGHT_COMPENSATION, 0, 2, 1, 1);
+        if (has_hflip)
+                v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_HFLIP, 0, 1, 1, 0);
+
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+        return 0;
+}
+
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .stopN = sd_stopN,
         .stop0 = sd_stop0,
@@ -3253,10 +3072,9 @@ static const struct sd_desc sd_desc = {
 
 static const struct sd_desc sd_desc_isoc_nego = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
         .init = sd_init,
+        .init_controls = sd_init_controls,
         .start = sd_start,
         .isoc_init = sd_isoc_init,
         .isoc_nego = sd_isoc_nego,
@@ -3320,6 +3138,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
         .suspend = gspca_suspend,
         .resume = gspca_resume,
+        .reset_resume = gspca_resume,
 #endif
 };
 
diff --git a/drivers/media/video/m5mols/m5mols_controls.c b/drivers/media/video/m5mols/m5mols_controls.c
index 392a028730e2..fdbc205a2969 100644
--- a/drivers/media/video/m5mols/m5mols_controls.c
+++ b/drivers/media/video/m5mols/m5mols_controls.c
@@ -527,8 +527,8 @@ static const struct v4l2_ctrl_ops m5mols_ctrl_ops = {
 
 /* Supported manual ISO values */
 static const s64 iso_qmenu[] = {
-        /* AE_ISO: 0x01...0x07 */
-        50, 100, 200, 400, 800, 1600, 3200
+        /* AE_ISO: 0x01...0x07 (ISO: 50...3200) */
+        50000, 100000, 200000, 400000, 800000, 1600000, 3200000
 };
 
 /* Supported Exposure Bias values, -2.0EV...+2.0EV */
diff --git a/drivers/media/video/mem2mem_testdev.c b/drivers/media/video/mem2mem_testdev.c
index f08cf38a496d..7efe9ad7acc7 100644
--- a/drivers/media/video/mem2mem_testdev.c
+++ b/drivers/media/video/mem2mem_testdev.c
@@ -27,6 +27,8 @@
 #include <media/v4l2-mem2mem.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-event.h>
 #include <media/videobuf2-vmalloc.h>
 
 #define MEM2MEM_TEST_MODULE_NAME "mem2mem-testdev"
@@ -101,6 +103,8 @@ static struct m2mtest_fmt formats[] = {
         },
 };
 
+#define NUM_FORMATS ARRAY_SIZE(formats)
+
 /* Per-queue, driver-specific private data */
 struct m2mtest_q_data {
         unsigned int            width;
@@ -114,50 +118,8 @@ enum {
         V4L2_M2M_DST = 1,
 };
 
-#define V4L2_CID_TRANS_TIME_MSEC        V4L2_CID_PRIVATE_BASE
-#define V4L2_CID_TRANS_NUM_BUFS         (V4L2_CID_PRIVATE_BASE + 1)
-
-static struct v4l2_queryctrl m2mtest_ctrls[] = {
-        {
-                .id             = V4L2_CID_HFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Mirror",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-                .flags          = 0,
-        }, {
-                .id             = V4L2_CID_VFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Vertical Mirror",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-                .flags          = 0,
-        }, {
-                .id             = V4L2_CID_TRANS_TIME_MSEC,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Transaction time (msec)",
-                .minimum        = 1,
-                .maximum        = 10000,
-                .step           = 100,
-                .default_value  = 1000,
-                .flags          = 0,
-        }, {
-                .id             = V4L2_CID_TRANS_NUM_BUFS,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Buffers per transaction",
-                .minimum        = 1,
-                .maximum        = MEM2MEM_DEF_NUM_BUFS,
-                .step           = 1,
-                .default_value  = 1,
-                .flags          = 0,
-        },
-};
-
-#define NUM_FORMATS ARRAY_SIZE(formats)
+#define V4L2_CID_TRANS_TIME_MSEC        (V4L2_CID_USER_BASE + 0x1000)
+#define V4L2_CID_TRANS_NUM_BUFS         (V4L2_CID_USER_BASE + 0x1001)
 
 static struct m2mtest_fmt *find_format(struct v4l2_format *f)
 {
@@ -190,8 +152,11 @@ struct m2mtest_dev {
 };
 
 struct m2mtest_ctx {
+        struct v4l2_fh          fh;
         struct m2mtest_dev      *dev;
 
+        struct v4l2_ctrl_handler hdl;
+
         /* Processed buffers in this transaction */
         u8                      num_processed;
 
@@ -206,12 +171,19 @@ struct m2mtest_ctx {
         /* Processing mode */
         int                     mode;
 
+        enum v4l2_colorspace    colorspace;
+
         struct v4l2_m2m_ctx     *m2m_ctx;
 
         /* Source and destination queue data */
         struct m2mtest_q_data   q_data[2];
 };
 
+static inline struct m2mtest_ctx *file2ctx(struct file *file)
+{
+        return container_of(file->private_data, struct m2mtest_ctx, fh);
+}
+
 static struct m2mtest_q_data *get_q_data(struct m2mtest_ctx *ctx,
                                          enum v4l2_buf_type type)
 {
@@ -227,18 +199,6 @@ static struct m2mtest_q_data *get_q_data(struct m2mtest_ctx *ctx,
 }
 
 
-static struct v4l2_queryctrl *get_ctrl(int id)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(m2mtest_ctrls); ++i) {
-                if (id == m2mtest_ctrls[i].id)
-                        return &m2mtest_ctrls[i];
-        }
-
-        return NULL;
-}
-
 static int device_process(struct m2mtest_ctx *ctx,
                           struct vb2_buffer *in_vb,
                           struct vb2_buffer *out_vb)
@@ -470,10 +430,9 @@ static int vidioc_querycap(struct file *file, void *priv,
 {
         strncpy(cap->driver, MEM2MEM_NAME, sizeof(cap->driver) - 1);
         strncpy(cap->card, MEM2MEM_NAME, sizeof(cap->card) - 1);
-        cap->bus_info[0] = 0;
-        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT
-                          | V4L2_CAP_STREAMING;
-
+        strlcpy(cap->bus_info, MEM2MEM_NAME, sizeof(cap->bus_info));
+        cap->capabilities = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
@@ -536,6 +495,7 @@ static int vidioc_g_fmt(struct m2mtest_ctx *ctx, struct v4l2_format *f)
         f->fmt.pix.pixelformat  = q_data->fmt->fourcc;
         f->fmt.pix.bytesperline = (q_data->width * q_data->fmt->depth) >> 3;
         f->fmt.pix.sizeimage    = q_data->sizeimage;
+        f->fmt.pix.colorspace   = ctx->colorspace;
 
         return 0;
 }
@@ -543,13 +503,13 @@ static int vidioc_g_fmt(struct m2mtest_ctx *ctx, struct v4l2_format *f)
 static int vidioc_g_fmt_vid_out(struct file *file, void *priv,
                                 struct v4l2_format *f)
 {
-        return vidioc_g_fmt(priv, f);
+        return vidioc_g_fmt(file2ctx(file), f);
 }
 
 static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
                                 struct v4l2_format *f)
 {
-        return vidioc_g_fmt(priv, f);
+        return vidioc_g_fmt(file2ctx(file), f);
 }
 
 static int vidioc_try_fmt(struct v4l2_format *f, struct m2mtest_fmt *fmt)
@@ -588,7 +548,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
                                   struct v4l2_format *f)
 {
         struct m2mtest_fmt *fmt;
-        struct m2mtest_ctx *ctx = priv;
+        struct m2mtest_ctx *ctx = file2ctx(file);
 
         fmt = find_format(f);
         if (!fmt || !(fmt->types & MEM2MEM_CAPTURE)) {
@@ -597,6 +557,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
                          f->fmt.pix.pixelformat);
                 return -EINVAL;
         }
+        f->fmt.pix.colorspace = ctx->colorspace;
 
         return vidioc_try_fmt(f, fmt);
 }
@@ -605,7 +566,7 @@ static int vidioc_try_fmt_vid_out(struct file *file, void *priv,
                                   struct v4l2_format *f)
 {
         struct m2mtest_fmt *fmt;
-        struct m2mtest_ctx *ctx = priv;
+        struct m2mtest_ctx *ctx = file2ctx(file);
 
         fmt = find_format(f);
         if (!fmt || !(fmt->types & MEM2MEM_OUTPUT)) {
@@ -614,6 +575,8 @@ static int vidioc_try_fmt_vid_out(struct file *file, void *priv,
                          f->fmt.pix.pixelformat);
                 return -EINVAL;
         }
+        if (!f->fmt.pix.colorspace)
+                f->fmt.pix.colorspace = V4L2_COLORSPACE_REC709;
 
         return vidioc_try_fmt(f, fmt);
 }
@@ -658,25 +621,29 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
         if (ret)
                 return ret;
 
-        return vidioc_s_fmt(priv, f);
+        return vidioc_s_fmt(file2ctx(file), f);
 }
 
 static int vidioc_s_fmt_vid_out(struct file *file, void *priv,
                                 struct v4l2_format *f)
 {
+        struct m2mtest_ctx *ctx = file2ctx(file);
         int ret;
 
         ret = vidioc_try_fmt_vid_out(file, priv, f);
         if (ret)
                 return ret;
 
-        return vidioc_s_fmt(priv, f);
+        ret = vidioc_s_fmt(file2ctx(file), f);
+        if (!ret)
+                ctx->colorspace = f->fmt.pix.colorspace;
+        return ret;
 }
 
 static int vidioc_reqbufs(struct file *file, void *priv,
                           struct v4l2_requestbuffers *reqbufs)
 {
-        struct m2mtest_ctx *ctx = priv;
+        struct m2mtest_ctx *ctx = file2ctx(file);
 
         return v4l2_m2m_reqbufs(file, ctx->m2m_ctx, reqbufs);
 }
@@ -684,21 +651,21 @@ static int vidioc_reqbufs(struct file *file, void *priv,
 static int vidioc_querybuf(struct file *file, void *priv,
                            struct v4l2_buffer *buf)
 {
-        struct m2mtest_ctx *ctx = priv;
+        struct m2mtest_ctx *ctx = file2ctx(file);
 
         return v4l2_m2m_querybuf(file, ctx->m2m_ctx, buf);
 }
 
 static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
 {
-        struct m2mtest_ctx *ctx = priv;
+        struct m2mtest_ctx *ctx = file2ctx(file);
 
         return v4l2_m2m_qbuf(file, ctx->m2m_ctx, buf);
 }
 
 static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
 {
-        struct m2mtest_ctx *ctx = priv;
+        struct m2mtest_ctx *ctx = file2ctx(file);
 
         return v4l2_m2m_dqbuf(file, ctx->m2m_ctx, buf);
 }
@@ -706,7 +673,7 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
 static int vidioc_streamon(struct file *file, void *priv,
                            enum v4l2_buf_type type)
 {
-        struct m2mtest_ctx *ctx = priv;
+        struct m2mtest_ctx *ctx = file2ctx(file);
 
         return v4l2_m2m_streamon(file, ctx->m2m_ctx, type);
 }
@@ -714,101 +681,37 @@ static int vidioc_streamon(struct file *file, void *priv,
 static int vidioc_streamoff(struct file *file, void *priv,
                             enum v4l2_buf_type type)
 {
-        struct m2mtest_ctx *ctx = priv;
+        struct m2mtest_ctx *ctx = file2ctx(file);
 
         return v4l2_m2m_streamoff(file, ctx->m2m_ctx, type);
 }
 
-static int vidioc_queryctrl(struct file *file, void *priv,
-                            struct v4l2_queryctrl *qc)
-{
-        struct v4l2_queryctrl *c;
-
-        c = get_ctrl(qc->id);
-        if (!c)
-                return -EINVAL;
-
-        *qc = *c;
-        return 0;
-}
-
-static int vidioc_g_ctrl(struct file *file, void *priv,
-                         struct v4l2_control *ctrl)
+static int m2mtest_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct m2mtest_ctx *ctx = priv;
+        struct m2mtest_ctx *ctx =
+                container_of(ctrl->handler, struct m2mtest_ctx, hdl);
 
         switch (ctrl->id) {
         case V4L2_CID_HFLIP:
-                ctrl->value = (ctx->mode & MEM2MEM_HFLIP) ? 1 : 0;
-                break;
-
-        case V4L2_CID_VFLIP:
-                ctrl->value = (ctx->mode & MEM2MEM_VFLIP) ? 1 : 0;
-                break;
-
-        case V4L2_CID_TRANS_TIME_MSEC:
-                ctrl->value = ctx->transtime;
-                break;
-
-        case V4L2_CID_TRANS_NUM_BUFS:
-                ctrl->value = ctx->translen;
-                break;
-
-        default:
-                v4l2_err(&ctx->dev->v4l2_dev, "Invalid control\n");
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static int check_ctrl_val(struct m2mtest_ctx *ctx, struct v4l2_control *ctrl)
-{
-        struct v4l2_queryctrl *c;
-
-        c = get_ctrl(ctrl->id);
-        if (!c)
-                return -EINVAL;
-
-        if (ctrl->value < c->minimum || ctrl->value > c->maximum) {
-                v4l2_err(&ctx->dev->v4l2_dev, "Value out of range\n");
-                return -ERANGE;
-        }
-
-        return 0;
-}
-
-static int vidioc_s_ctrl(struct file *file, void *priv,
-                         struct v4l2_control *ctrl)
-{
-        struct m2mtest_ctx *ctx = priv;
-        int ret = 0;
-
-        ret = check_ctrl_val(ctx, ctrl);
-        if (ret != 0)
-                return ret;
-
-        switch (ctrl->id) {
-        case V4L2_CID_HFLIP:
-                if (ctrl->value)
+                if (ctrl->val)
                         ctx->mode |= MEM2MEM_HFLIP;
                 else
                         ctx->mode &= ~MEM2MEM_HFLIP;
                 break;
 
         case V4L2_CID_VFLIP:
-                if (ctrl->value)
+                if (ctrl->val)
                         ctx->mode |= MEM2MEM_VFLIP;
                 else
                         ctx->mode &= ~MEM2MEM_VFLIP;
                 break;
 
         case V4L2_CID_TRANS_TIME_MSEC:
-                ctx->transtime = ctrl->value;
+                ctx->transtime = ctrl->val;
                 break;
 
         case V4L2_CID_TRANS_NUM_BUFS:
-                ctx->translen = ctrl->value;
+                ctx->translen = ctrl->val;
                 break;
 
         default:
@@ -819,6 +722,10 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
         return 0;
 }
 
+static const struct v4l2_ctrl_ops m2mtest_ctrl_ops = {
+        .s_ctrl = m2mtest_s_ctrl,
+};
+
 
 static const struct v4l2_ioctl_ops m2mtest_ioctl_ops = {
         .vidioc_querycap        = vidioc_querycap,
@@ -841,10 +748,8 @@ static const struct v4l2_ioctl_ops m2mtest_ioctl_ops = {
 
         .vidioc_streamon        = vidioc_streamon,
         .vidioc_streamoff       = vidioc_streamoff,
-
-        .vidioc_queryctrl       = vidioc_queryctrl,
-        .vidioc_g_ctrl          = vidioc_g_ctrl,
-        .vidioc_s_ctrl          = vidioc_s_ctrl,
+        .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
+        .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
 };
 
 
@@ -956,6 +861,28 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *ds
         return vb2_queue_init(dst_vq);
 }
 
+static const struct v4l2_ctrl_config m2mtest_ctrl_trans_time_msec = {
+        .ops = &m2mtest_ctrl_ops,
+        .id = V4L2_CID_TRANS_TIME_MSEC,
+        .name = "Transaction Time (msec)",
+        .type = V4L2_CTRL_TYPE_INTEGER,
+        .def = 1001,
+        .min = 1,
+        .max = 10001,
+        .step = 100,
+};
+
+static const struct v4l2_ctrl_config m2mtest_ctrl_trans_num_bufs = {
+        .ops = &m2mtest_ctrl_ops,
+        .id = V4L2_CID_TRANS_NUM_BUFS,
+        .name = "Buffers Per Transaction",
+        .type = V4L2_CTRL_TYPE_INTEGER,
+        .def = 1,
+        .min = 1,
+        .max = MEM2MEM_DEF_NUM_BUFS,
+        .step = 1,
+};
+
 /*
  * File operations
  */
@@ -963,30 +890,51 @@ static int m2mtest_open(struct file *file)
 {
         struct m2mtest_dev *dev = video_drvdata(file);
         struct m2mtest_ctx *ctx = NULL;
+        struct v4l2_ctrl_handler *hdl;
 
         ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
         if (!ctx)
                 return -ENOMEM;
 
-        file->private_data = ctx;
+        v4l2_fh_init(&ctx->fh, video_devdata(file));
+        file->private_data = &ctx->fh;
         ctx->dev = dev;
-        ctx->translen = MEM2MEM_DEF_TRANSLEN;
-        ctx->transtime = MEM2MEM_DEF_TRANSTIME;
-        ctx->num_processed = 0;
-        ctx->mode = 0;
+        hdl = &ctx->hdl;
+        v4l2_ctrl_handler_init(hdl, 4);
+        v4l2_ctrl_new_std(hdl, &m2mtest_ctrl_ops, V4L2_CID_HFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(hdl, &m2mtest_ctrl_ops, V4L2_CID_VFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_custom(hdl, &m2mtest_ctrl_trans_time_msec, NULL);
+        v4l2_ctrl_new_custom(hdl, &m2mtest_ctrl_trans_num_bufs, NULL);
+        if (hdl->error) {
+                int err = hdl->error;
+
+                v4l2_ctrl_handler_free(hdl);
+                return err;
+        }
+        ctx->fh.ctrl_handler = hdl;
+        v4l2_ctrl_handler_setup(hdl);
 
         ctx->q_data[V4L2_M2M_SRC].fmt = &formats[0];
-        ctx->q_data[V4L2_M2M_DST].fmt = &formats[0];
+        ctx->q_data[V4L2_M2M_SRC].width = 640;
+        ctx->q_data[V4L2_M2M_SRC].height = 480;
+        ctx->q_data[V4L2_M2M_SRC].sizeimage =
+                ctx->q_data[V4L2_M2M_SRC].width *
+                ctx->q_data[V4L2_M2M_SRC].height *
+                (ctx->q_data[V4L2_M2M_SRC].fmt->depth >> 3);
+        ctx->q_data[V4L2_M2M_DST] = ctx->q_data[V4L2_M2M_SRC];
+        ctx->colorspace = V4L2_COLORSPACE_REC709;
 
         ctx->m2m_ctx = v4l2_m2m_ctx_init(dev->m2m_dev, ctx, &queue_init);
 
         if (IS_ERR(ctx->m2m_ctx)) {
                 int ret = PTR_ERR(ctx->m2m_ctx);
 
+                v4l2_ctrl_handler_free(hdl);
                 kfree(ctx);
                 return ret;
         }
 
+        v4l2_fh_add(&ctx->fh);
         atomic_inc(&dev->num_inst);
 
         dprintk(dev, "Created instance %p, m2m_ctx: %p\n", ctx, ctx->m2m_ctx);
@@ -997,10 +945,13 @@ static int m2mtest_open(struct file *file)
 static int m2mtest_release(struct file *file)
 {
         struct m2mtest_dev *dev = video_drvdata(file);
-        struct m2mtest_ctx *ctx = file->private_data;
+        struct m2mtest_ctx *ctx = file2ctx(file);
 
         dprintk(dev, "Releasing instance %p\n", ctx);
 
+        v4l2_fh_del(&ctx->fh);
+        v4l2_fh_exit(&ctx->fh);
+        v4l2_ctrl_handler_free(&ctx->hdl);
         v4l2_m2m_ctx_release(ctx->m2m_ctx);
         kfree(ctx);
 
@@ -1012,14 +963,14 @@ static int m2mtest_release(struct file *file)
 static unsigned int m2mtest_poll(struct file *file,
                                  struct poll_table_struct *wait)
 {
-        struct m2mtest_ctx *ctx = file->private_data;
+        struct m2mtest_ctx *ctx = file2ctx(file);
 
         return v4l2_m2m_poll(file, ctx->m2m_ctx, wait);
 }
 
 static int m2mtest_mmap(struct file *file, struct vm_area_struct *vma)
 {
-        struct m2mtest_ctx *ctx = file->private_data;
+        struct m2mtest_ctx *ctx = file2ctx(file);
 
         return v4l2_m2m_mmap(file, ctx->m2m_ctx, vma);
 }
diff --git a/drivers/media/video/mx2_emmaprp.c b/drivers/media/video/mx2_emmaprp.c
index 0bd5815de369..5f8a6f5b98f9 100644
--- a/drivers/media/video/mx2_emmaprp.c
+++ b/drivers/media/video/mx2_emmaprp.c
@@ -396,9 +396,13 @@ static int vidioc_querycap(struct file *file, void *priv,
 {
         strncpy(cap->driver, MEM2MEM_NAME, sizeof(cap->driver) - 1);
         strncpy(cap->card, MEM2MEM_NAME, sizeof(cap->card) - 1);
-        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT
-                          | V4L2_CAP_STREAMING;
-
+        /*
+         * This is only a mem-to-mem video device. The capture and output
+         * device capability flags are left only for backward compatibility
+         * and are scheduled for removal.
+         */
+        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT |
+                            V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
         return 0;
 }
 
diff --git a/drivers/media/video/ov2640.c b/drivers/media/video/ov2640.c
index 3c2c5d3bcc6b..7c44d1fe3c87 100644
--- a/drivers/media/video/ov2640.c
+++ b/drivers/media/video/ov2640.c
@@ -837,10 +837,8 @@ static int ov2640_g_fmt(struct v4l2_subdev *sd,
 
         if (!priv->win) {
                 u32 width = W_SVGA, height = H_SVGA;
-                int ret = ov2640_set_params(client, &width, &height,
-                                            V4L2_MBUS_FMT_UYVY8_2X8);
-                if (ret < 0)
-                        return ret;
+                priv->win = ov2640_select_win(&width, &height);
+                priv->cfmt_code = V4L2_MBUS_FMT_UYVY8_2X8;
         }
 
         mf->width       = priv->win->width;
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c
index 74e77d327ed8..6d79b89b8603 100644
--- a/drivers/media/video/ov772x.c
+++ b/drivers/media/video/ov772x.c
@@ -880,15 +880,11 @@ static int ov772x_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
 static int ov772x_g_fmt(struct v4l2_subdev *sd,
                         struct v4l2_mbus_framefmt *mf)
 {
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct ov772x_priv *priv = container_of(sd, struct ov772x_priv, subdev);
 
         if (!priv->win || !priv->cfmt) {
-                u32 width = VGA_WIDTH, height = VGA_HEIGHT;
-                int ret = ov772x_set_params(client, &width, &height,
-                                            V4L2_MBUS_FMT_YUYV8_2X8);
-                if (ret < 0)
-                        return ret;
+                priv->cfmt = &ov772x_cfmts[0];
+                priv->win = ov772x_select_win(VGA_WIDTH, VGA_HEIGHT);
         }
 
         mf->width       = priv->win->width;
diff --git a/drivers/media/video/ov9640.c b/drivers/media/video/ov9640.c
index 23412debb36b..9ed4ba4236c4 100644
--- a/drivers/media/video/ov9640.c
+++ b/drivers/media/video/ov9640.c
@@ -605,6 +605,7 @@ static int ov9640_video_probe(struct i2c_client *client)
                 devname         = "ov9640";
                 priv->model     = V4L2_IDENT_OV9640;
                 priv->revision  = 2;
+                break;
         case OV9640_V3:
                 devname         = "ov9640";
                 priv->model     = V4L2_IDENT_OV9640;
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index b4c679b3fb0f..77f9c92186f4 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -30,7 +30,6 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/mutex.h>
-#include <linux/slab.h>
 #include <linux/uaccess.h>
 #include <linux/isa.h>
 #include <asm/io.h>
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 01c2179f0520..95007dda0c93 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -2686,3 +2686,4 @@ MODULE_DESCRIPTION("Sensoray 2255 Video for Linux driver");
 MODULE_AUTHOR("Dean Anderson (Sensoray Company Inc.)");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(S2255_VERSION);
+MODULE_FIRMWARE(FIRMWARE_FILE_NAME);
diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c
index 6a34183564d2..8e413dd3c0b0 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -480,48 +480,59 @@ static int fimc_capture_set_default_format(struct fimc_dev *fimc);
 static int fimc_capture_open(struct file *file)
 {
         struct fimc_dev *fimc = video_drvdata(file);
-        int ret;
+        int ret = -EBUSY;
 
         dbg("pid: %d, state: 0x%lx", task_pid_nr(current), fimc->state);
 
+        if (mutex_lock_interruptible(&fimc->lock))
+                return -ERESTARTSYS;
+
         if (fimc_m2m_active(fimc))
-                return -EBUSY;
+                goto unlock;
 
         set_bit(ST_CAPT_BUSY, &fimc->state);
         ret = pm_runtime_get_sync(&fimc->pdev->dev);
         if (ret < 0)
-                return ret;
+                goto unlock;
 
         ret = v4l2_fh_open(file);
-        if (ret)
-                return ret;
-
-        if (++fimc->vid_cap.refcnt != 1)
-                return 0;
+        if (ret) {
+                pm_runtime_put(&fimc->pdev->dev);
+                goto unlock;
+        }
 
-        ret = fimc_pipeline_initialize(&fimc->pipeline,
+        if (++fimc->vid_cap.refcnt == 1) {
+                ret = fimc_pipeline_initialize(&fimc->pipeline,
                                        &fimc->vid_cap.vfd->entity, true);
-        if (ret < 0) {
-                clear_bit(ST_CAPT_BUSY, &fimc->state);
-                pm_runtime_put_sync(&fimc->pdev->dev);
-                fimc->vid_cap.refcnt--;
-                v4l2_fh_release(file);
-                return ret;
-        }
-        ret = fimc_capture_ctrls_create(fimc);
 
-        if (!ret && !fimc->vid_cap.user_subdev_api)
-                ret = fimc_capture_set_default_format(fimc);
+                if (!ret && !fimc->vid_cap.user_subdev_api)
+                        ret = fimc_capture_set_default_format(fimc);
+
+                if (!ret)
+                        ret = fimc_capture_ctrls_create(fimc);
 
+                if (ret < 0) {
+                        clear_bit(ST_CAPT_BUSY, &fimc->state);
+                        pm_runtime_put_sync(&fimc->pdev->dev);
+                        fimc->vid_cap.refcnt--;
+                        v4l2_fh_release(file);
+                }
+        }
+unlock:
+        mutex_unlock(&fimc->lock);
         return ret;
 }
 
 static int fimc_capture_close(struct file *file)
 {
         struct fimc_dev *fimc = video_drvdata(file);
+        int ret;
 
         dbg("pid: %d, state: 0x%lx", task_pid_nr(current), fimc->state);
 
+        if (mutex_lock_interruptible(&fimc->lock))
+                return -ERESTARTSYS;
+
         if (--fimc->vid_cap.refcnt == 0) {
                 clear_bit(ST_CAPT_BUSY, &fimc->state);
                 fimc_stop_capture(fimc, false);
@@ -535,22 +546,40 @@ static int fimc_capture_close(struct file *file)
                 vb2_queue_release(&fimc->vid_cap.vbq);
                 fimc_ctrls_delete(fimc->vid_cap.ctx);
         }
-        return v4l2_fh_release(file);
+
+        ret = v4l2_fh_release(file);
+
+        mutex_unlock(&fimc->lock);
+        return ret;
 }
 
 static unsigned int fimc_capture_poll(struct file *file,
                                       struct poll_table_struct *wait)
 {
         struct fimc_dev *fimc = video_drvdata(file);
+        int ret;
 
-        return vb2_poll(&fimc->vid_cap.vbq, file, wait);
+        if (mutex_lock_interruptible(&fimc->lock))
+                return POLL_ERR;
+
+        ret = vb2_poll(&fimc->vid_cap.vbq, file, wait);
+        mutex_unlock(&fimc->lock);
+
+        return ret;
 }
 
 static int fimc_capture_mmap(struct file *file, struct vm_area_struct *vma)
 {
         struct fimc_dev *fimc = video_drvdata(file);
+        int ret;
+
+        if (mutex_lock_interruptible(&fimc->lock))
+                return -ERESTARTSYS;
 
-        return vb2_mmap(&fimc->vid_cap.vbq, vma);
+        ret = vb2_mmap(&fimc->vid_cap.vbq, vma);
+        mutex_unlock(&fimc->lock);
+
+        return ret;
 }
 
 static const struct v4l2_file_operations fimc_capture_fops = {
@@ -1589,10 +1618,7 @@ static int fimc_register_capture_device(struct fimc_dev *fimc,
         vfd->minor      = -1;
         vfd->release    = video_device_release;
         vfd->lock       = &fimc->lock;
-        /* Locking in file operations other than ioctl should be done
-           by the driver, not the V4L2 core.
-           This driver needs auditing so that this flag can be removed. */
-        set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
+
         video_set_drvdata(vfd, fimc);
 
         vid_cap = &fimc->vid_cap;
diff --git a/drivers/media/video/s5p-fimc/fimc-core.h b/drivers/media/video/s5p-fimc/fimc-core.h
index 95b27ae5cf27..808ccc621846 100644
--- a/drivers/media/video/s5p-fimc/fimc-core.h
+++ b/drivers/media/video/s5p-fimc/fimc-core.h
@@ -27,9 +27,6 @@
 #include <media/v4l2-mediabus.h>
 #include <media/s5p_fimc.h>
 
-#define err(fmt, args...) \
-        printk(KERN_ERR "%s:%d: " fmt "\n", __func__, __LINE__, ##args)
-
 #define dbg(fmt, args...) \
         pr_debug("%s:%d: " fmt "\n", __func__, __LINE__, ##args)
 
diff --git a/drivers/media/video/s5p-fimc/fimc-m2m.c b/drivers/media/video/s5p-fimc/fimc-m2m.c
index 4c58e0570962..c587011d80ef 100644
--- a/drivers/media/video/s5p-fimc/fimc-m2m.c
+++ b/drivers/media/video/s5p-fimc/fimc-m2m.c
@@ -259,7 +259,12 @@ static int fimc_m2m_querycap(struct file *file, void *fh,
         strncpy(cap->driver, fimc->pdev->name, sizeof(cap->driver) - 1);
         strncpy(cap->card, fimc->pdev->name, sizeof(cap->card) - 1);
         cap->bus_info[0] = 0;
-        cap->capabilities = V4L2_CAP_STREAMING |
+        /*
+         * This is only a mem-to-mem video device. The capture and output
+         * device capability flags are left only for backward compatibility
+         * and are scheduled for removal.
+         */
+        cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M_MPLANE |
                 V4L2_CAP_VIDEO_CAPTURE_MPLANE | V4L2_CAP_VIDEO_OUTPUT_MPLANE;
 
         return 0;
@@ -642,21 +647,25 @@ static int fimc_m2m_open(struct file *file)
 {
         struct fimc_dev *fimc = video_drvdata(file);
         struct fimc_ctx *ctx;
-        int ret;
+        int ret = -EBUSY;
 
         dbg("pid: %d, state: 0x%lx, refcnt: %d",
             task_pid_nr(current), fimc->state, fimc->vid_cap.refcnt);
 
+        if (mutex_lock_interruptible(&fimc->lock))
+                return -ERESTARTSYS;
         /*
          * Return if the corresponding video capture node
          * is already opened.
          */
         if (fimc->vid_cap.refcnt > 0)
-                return -EBUSY;
+                goto unlock;
 
         ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
-        if (!ctx)
-                return -ENOMEM;
+        if (!ctx) {
+                ret = -ENOMEM;
+                goto unlock;
+        }
         v4l2_fh_init(&ctx->fh, fimc->m2m.vfd);
         ctx->fimc_dev = fimc;
 
@@ -687,6 +696,8 @@ static int fimc_m2m_open(struct file *file)
 
         if (fimc->m2m.refcnt++ == 0)
                 set_bit(ST_M2M_RUN, &fimc->state);
+
+        mutex_unlock(&fimc->lock);
         return 0;
 
 error_c:
@@ -695,6 +706,8 @@ error_fh:
         v4l2_fh_del(&ctx->fh);
         v4l2_fh_exit(&ctx->fh);
         kfree(ctx);
+unlock:
+        mutex_unlock(&fimc->lock);
         return ret;
 }
 
@@ -706,6 +719,9 @@ static int fimc_m2m_release(struct file *file)
         dbg("pid: %d, state: 0x%lx, refcnt= %d",
                 task_pid_nr(current), fimc->state, fimc->m2m.refcnt);
 
+        if (mutex_lock_interruptible(&fimc->lock))
+                return -ERESTARTSYS;
+
         v4l2_m2m_ctx_release(ctx->m2m_ctx);
         fimc_ctrls_delete(ctx);
         v4l2_fh_del(&ctx->fh);
@@ -714,6 +730,8 @@ static int fimc_m2m_release(struct file *file)
         if (--fimc->m2m.refcnt <= 0)
                 clear_bit(ST_M2M_RUN, &fimc->state);
         kfree(ctx);
+
+        mutex_unlock(&fimc->lock);
         return 0;
 }
 
@@ -721,16 +739,32 @@ static unsigned int fimc_m2m_poll(struct file *file,
                                   struct poll_table_struct *wait)
 {
         struct fimc_ctx *ctx = fh_to_ctx(file->private_data);
+        struct fimc_dev *fimc = ctx->fimc_dev;
+        int ret;
+
+        if (mutex_lock_interruptible(&fimc->lock))
+                return -ERESTARTSYS;
+
+        ret = v4l2_m2m_poll(file, ctx->m2m_ctx, wait);
+        mutex_unlock(&fimc->lock);
 
-        return v4l2_m2m_poll(file, ctx->m2m_ctx, wait);
+        return ret;
 }
 
 
 static int fimc_m2m_mmap(struct file *file, struct vm_area_struct *vma)
 {
         struct fimc_ctx *ctx = fh_to_ctx(file->private_data);
+        struct fimc_dev *fimc = ctx->fimc_dev;
+        int ret;
+
+        if (mutex_lock_interruptible(&fimc->lock))
+                return -ERESTARTSYS;
 
-        return v4l2_m2m_mmap(file, ctx->m2m_ctx, vma);
+        ret = v4l2_m2m_mmap(file, ctx->m2m_ctx, vma);
+        mutex_unlock(&fimc->lock);
+
+        return ret;
 }
 
 static const struct v4l2_file_operations fimc_m2m_fops = {
@@ -772,10 +806,6 @@ int fimc_register_m2m_device(struct fimc_dev *fimc,
         vfd->minor = -1;
         vfd->release = video_device_release;
         vfd->lock = &fimc->lock;
-        /* Locking in file operations other than ioctl should be done
-           by the driver, not the V4L2 core.
-           This driver needs auditing so that this flag can be removed. */
-        set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
 
         snprintf(vfd->name, sizeof(vfd->name), "fimc.%d.m2m", fimc->id);
         video_set_drvdata(vfd, fimc);
diff --git a/drivers/media/video/s5p-fimc/fimc-reg.c b/drivers/media/video/s5p-fimc/fimc-reg.c
index 1fc4ce8446f5..0e3eb9ce4f98 100644
--- a/drivers/media/video/s5p-fimc/fimc-reg.c
+++ b/drivers/media/video/s5p-fimc/fimc-reg.c
@@ -667,7 +667,8 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc,
                 FIMC_REG_CIGCTRL_SELCAM_MIPI | FIMC_REG_CIGCTRL_CAMIF_SELWB |
                 FIMC_REG_CIGCTRL_SELCAM_MIPI_A | FIMC_REG_CIGCTRL_CAM_JPEG);
 
-        if (cam->bus_type == FIMC_MIPI_CSI2) {
+        switch (cam->bus_type) {
+        case FIMC_MIPI_CSI2:
                 cfg |= FIMC_REG_CIGCTRL_SELCAM_MIPI;
 
                 if (cam->mux_id == 0)
@@ -683,23 +684,24 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc,
                         cfg |= FIMC_REG_CIGCTRL_CAM_JPEG;
                         break;
                 default:
-                        v4l2_err(fimc->vid_cap.vfd,
-                                 "Not supported camera pixel format: %d",
+                        v4l2_err(vid_cap->vfd,
+                                 "Not supported camera pixel format: %#x\n",
                                  vid_cap->mf.code);
                         return -EINVAL;
                 }
                 tmp |= (csis_data_alignment == 32) << 8;
 
                 writel(tmp, fimc->regs + FIMC_REG_CSIIMGFMT);
-
-        } else if (cam->bus_type == FIMC_ITU_601 ||
-                   cam->bus_type == FIMC_ITU_656) {
+                break;
+        case FIMC_ITU_601...FIMC_ITU_656:
                 if (cam->mux_id == 0) /* ITU-A, ITU-B: 0, 1 */
                         cfg |= FIMC_REG_CIGCTRL_SELCAM_ITU_A;
-        } else if (cam->bus_type == FIMC_LCD_WB) {
+                break;
+        case FIMC_LCD_WB:
                 cfg |= FIMC_REG_CIGCTRL_CAMIF_SELWB;
-        } else {
-                err("invalid camera bus type selected\n");
+                break;
+        default:
+                v4l2_err(vid_cap->vfd, "Invalid camera bus type selected\n");
                 return -EINVAL;
         }
         writel(cfg, fimc->regs + FIMC_REG_CIGCTRL);
diff --git a/drivers/media/video/s5p-g2d/g2d.c b/drivers/media/video/s5p-g2d/g2d.c
index 7c98ee7377ee..7c2200435206 100644
--- a/drivers/media/video/s5p-g2d/g2d.c
+++ b/drivers/media/video/s5p-g2d/g2d.c
@@ -290,8 +290,13 @@ static int vidioc_querycap(struct file *file, void *priv,
         strncpy(cap->card, G2D_NAME, sizeof(cap->card) - 1);
         cap->bus_info[0] = 0;
         cap->version = KERNEL_VERSION(1, 0, 0);
-        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT
-                                                        | V4L2_CAP_STREAMING;
+        /*
+         * This is only a mem-to-mem video device. The capture and output
+         * device capability flags are left only for backward compatibility
+         * and are scheduled for removal.
+         */
+        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT |
+                            V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
         return 0;
 }
 
diff --git a/drivers/media/video/s5p-jpeg/jpeg-core.c b/drivers/media/video/s5p-jpeg/jpeg-core.c
index 95f23024b17d..813b801238d1 100644
--- a/drivers/media/video/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/video/s5p-jpeg/jpeg-core.c
@@ -489,9 +489,13 @@ static int s5p_jpeg_querycap(struct file *file, void *priv,
                         sizeof(cap->card));
         }
         cap->bus_info[0] = 0;
-        cap->capabilities = V4L2_CAP_STREAMING |
-                            V4L2_CAP_VIDEO_CAPTURE |
-                            V4L2_CAP_VIDEO_OUTPUT;
+        /*
+         * This is only a mem-to-mem video device. The capture and output
+         * device capability flags are left only for backward compatibility
+         * and are scheduled for removal.
+         */
+        cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M |
+                            V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT;
         return 0;
 }
 
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c b/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
index feea867f318c..c5d567f87d77 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
@@ -220,8 +220,14 @@ static int vidioc_querycap(struct file *file, void *priv,
         strncpy(cap->card, dev->plat_dev->name, sizeof(cap->card) - 1);
         cap->bus_info[0] = 0;
         cap->version = KERNEL_VERSION(1, 0, 0);
-        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE_MPLANE |
-                        V4L2_CAP_VIDEO_OUTPUT_MPLANE | V4L2_CAP_STREAMING;
+        /*
+         * This is only a mem-to-mem video device. The capture and output
+         * device capability flags are left only for backward compatibility
+         * and are scheduled for removal.
+         */
+        cap->capabilities = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING |
+                            V4L2_CAP_VIDEO_CAPTURE_MPLANE |
+                            V4L2_CAP_VIDEO_OUTPUT_MPLANE;
         return 0;
 }
 
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
index 158b78989b89..aa1c244cf66e 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
@@ -779,9 +779,14 @@ static int vidioc_querycap(struct file *file, void *priv,
         strncpy(cap->card, dev->plat_dev->name, sizeof(cap->card) - 1);
         cap->bus_info[0] = 0;
         cap->version = KERNEL_VERSION(1, 0, 0);
-        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE_MPLANE
-                          | V4L2_CAP_VIDEO_OUTPUT_MPLANE
-                          | V4L2_CAP_STREAMING;
+        /*
+         * This is only a mem-to-mem video device. The capture and output
+         * device capability flags are left only for backward compatibility
+         * and are scheduled for removal.
+         */
+        cap->capabilities = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING |
+                            V4L2_CAP_VIDEO_CAPTURE_MPLANE |
+                            V4L2_CAP_VIDEO_OUTPUT_MPLANE;
         return 0;
 }
 
diff --git a/drivers/media/video/saa7164/saa7164-i2c.c b/drivers/media/video/saa7164/saa7164-i2c.c
index 26148f76cba2..4f7e3b42263f 100644
--- a/drivers/media/video/saa7164/saa7164-i2c.c
+++ b/drivers/media/video/saa7164/saa7164-i2c.c
@@ -69,15 +69,6 @@ err:
         return retval;
 }
 
-void saa7164_call_i2c_clients(struct saa7164_i2c *bus, unsigned int cmd,
-        void *arg)
-{
-        if (bus->i2c_rc != 0)
-                return;
-
-        i2c_clients_command(&bus->i2c_adap, cmd, arg);
-}
-
 static u32 saa7164_functionality(struct i2c_adapter *adap)
 {
         return I2C_FUNC_I2C;
@@ -106,21 +97,14 @@ int saa7164_i2c_register(struct saa7164_i2c *bus)
 
         dprintk(DBGLVL_I2C, "%s(bus = %d)\n", __func__, bus->nr);
 
-        memcpy(&bus->i2c_adap, &saa7164_i2c_adap_template,
-               sizeof(bus->i2c_adap));
-
-        memcpy(&bus->i2c_algo, &saa7164_i2c_algo_template,
-               sizeof(bus->i2c_algo));
-
-        memcpy(&bus->i2c_client, &saa7164_i2c_client_template,
-               sizeof(bus->i2c_client));
+        bus->i2c_adap = saa7164_i2c_adap_template;
+        bus->i2c_client = saa7164_i2c_client_template;
 
         bus->i2c_adap.dev.parent = &dev->pci->dev;
 
         strlcpy(bus->i2c_adap.name, bus->dev->name,
                 sizeof(bus->i2c_adap.name));
 
-        bus->i2c_algo.data = bus;
         bus->i2c_adap.algo_data = bus;
         i2c_set_adapdata(&bus->i2c_adap, bus);
         i2c_add_adapter(&bus->i2c_adap);
diff --git a/drivers/media/video/saa7164/saa7164.h b/drivers/media/video/saa7164/saa7164.h
index 8d120e3baf70..35219b9b0fbc 100644
--- a/drivers/media/video/saa7164/saa7164.h
+++ b/drivers/media/video/saa7164/saa7164.h
@@ -46,7 +46,6 @@
 
 #include <linux/pci.h>
 #include <linux/i2c.h>
-#include <linux/i2c-algo-bit.h>
 #include <linux/kdev_t.h>
 #include <linux/mutex.h>
 #include <linux/crc32.h>
@@ -251,7 +250,6 @@ struct saa7164_i2c {
 
         /* I2C I/O */
         struct i2c_adapter              i2c_adap;
-        struct i2c_algo_bit_data        i2c_algo;
         struct i2c_client               i2c_client;
         u32                             i2c_rc;
 };
diff --git a/drivers/media/video/smiapp/smiapp-core.c b/drivers/media/video/smiapp/smiapp-core.c
index f466a7edcb2a..bfd47c106134 100644
--- a/drivers/media/video/smiapp/smiapp-core.c
+++ b/drivers/media/video/smiapp/smiapp-core.c
@@ -33,7 +33,6 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/regulator/consumer.h>
-#include <linux/slab.h>
 #include <linux/v4l2-mediabus.h>
 #include <media/v4l2-device.h>
 
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 0421bf9453b4..b03ffecb7438 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -62,7 +62,7 @@ static int soc_camera_power_on(struct soc_camera_device *icd,
         }
 
         if (icl->power) {
-                ret = icl->power(icd->pdev, 1);
+                ret = icl->power(icd->control, 1);
                 if (ret < 0) {
                         dev_err(icd->pdev,
                                 "Platform failed to power-on the camera.\n");
@@ -78,7 +78,7 @@ static int soc_camera_power_on(struct soc_camera_device *icd,
 
 esdpwr:
         if (icl->power)
-                icl->power(icd->pdev, 0);
+                icl->power(icd->control, 0);
 elinkpwr:
         regulator_bulk_disable(icl->num_regulators,
                                icl->regulators);
@@ -95,7 +95,7 @@ static int soc_camera_power_off(struct soc_camera_device *icd,
                 return ret;
 
         if (icl->power) {
-                ret = icl->power(icd->pdev, 0);
+                ret = icl->power(icd->control, 0);
                 if (ret < 0) {
                         dev_err(icd->pdev,
                                 "Platform failed to power-off the camera.\n");
@@ -1518,6 +1518,7 @@ static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver __refdata soc_camera_pdrv = {
+        .probe = soc_camera_pdrv_probe,
         .remove  = __devexit_p(soc_camera_pdrv_remove),
         .driver  = {
                 .name   = "soc-camera-pdrv",
@@ -1527,7 +1528,7 @@ static struct platform_driver __refdata soc_camera_pdrv = {
 
 static int __init soc_camera_init(void)
 {
-        return platform_driver_probe(&soc_camera_pdrv, soc_camera_pdrv_probe);
+        return platform_driver_register(&soc_camera_pdrv);
 }
 
 static void __exit soc_camera_exit(void)
diff --git a/drivers/media/video/tlg2300/pd-main.c b/drivers/media/video/tlg2300/pd-main.c
index c096b3f74200..7b1f6ebd0e2c 100644
--- a/drivers/media/video/tlg2300/pd-main.c
+++ b/drivers/media/video/tlg2300/pd-main.c
@@ -53,7 +53,8 @@ int debug_mode;
 module_param(debug_mode, int, 0644);
 MODULE_PARM_DESC(debug_mode, "0 = disable, 1 = enable, 2 = verbose");
 
-static const char *firmware_name = "tlg2300_firmware.bin";
+#define TLG2300_FIRMWARE "tlg2300_firmware.bin"
+static const char *firmware_name = TLG2300_FIRMWARE;
 static struct usb_driver poseidon_driver;
 static LIST_HEAD(pd_device_list);
 
@@ -532,3 +533,4 @@ MODULE_AUTHOR("Telegent Systems");
 MODULE_DESCRIPTION("For tlg2300-based USB device ");
 MODULE_LICENSE("GPL");
 MODULE_VERSION("0.0.2");
+MODULE_FIRMWARE(TLG2300_FIRMWARE);
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 0d897cb1774a..a751b6c146fd 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -257,7 +257,7 @@ static inline void tvp5150_selmux(struct v4l2_subdev *sd)
         int opmode = 0;
         struct tvp5150 *decoder = to_tvp5150(sd);
         int input = 0;
-        unsigned char val;
+        int val;
 
         if ((decoder->output & TVP5150_BLACK_SCREEN) || !decoder->enable)
                 input = 8;
diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index 8768efb8508a..9f53eacb66e3 100644
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/video/tw9910.c
@@ -699,11 +699,9 @@ static int tw9910_g_fmt(struct v4l2_subdev *sd,
         struct tw9910_priv *priv = to_tw9910(client);
 
         if (!priv->scale) {
-                int ret;
-                u32 width = 640, height = 480;
-                ret = tw9910_set_frame(sd, &width, &height);
-                if (ret < 0)
-                        return ret;
+                priv->scale = tw9910_select_norm(priv->norm, 640, 480);
+                if (!priv->scale)
+                        return -EINVAL;
         }
 
         mf->width       = priv->scale->width;
diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c
index ac365cfb3706..9ebd5c540d10 100644
--- a/drivers/media/video/v4l2-compat-ioctl32.c
+++ b/drivers/media/video/v4l2-compat-ioctl32.c
@@ -1025,6 +1025,7 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
         case VIDIOC_ENUM_DV_TIMINGS:
         case VIDIOC_QUERY_DV_TIMINGS:
         case VIDIOC_DV_TIMINGS_CAP:
+        case VIDIOC_ENUM_FREQ_BANDS:
                 ret = do_video_ioctl(file, cmd, arg);
                 break;
 
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c
index 9abd9abd4502..b6a2ee71e5c3 100644
--- a/drivers/media/video/v4l2-ctrls.c
+++ b/drivers/media/video/v4l2-ctrls.c
@@ -755,6 +755,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
         case V4L2_CID_HUE_AUTO:
         case V4L2_CID_CHROMA_AGC:
         case V4L2_CID_COLOR_KILLER:
+        case V4L2_CID_AUTOBRIGHTNESS:
         case V4L2_CID_MPEG_AUDIO_MUTE:
         case V4L2_CID_MPEG_VIDEO_MUTE:
         case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:
@@ -2120,7 +2121,7 @@ static int prepare_ext_ctrls(struct v4l2_ctrl_handler *hdl,
 
         /* First zero the helper field in the master control references */
         for (i = 0; i < cs->count; i++)
-                helpers[i].mref->helper = 0;
+                helpers[i].mref->helper = NULL;
         for (i = 0, h = helpers; i < cs->count; i++, h++) {
                 struct v4l2_ctrl_ref *mref = h->mref;
 
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index af70f931727c..07aeafca9eaa 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -478,12 +478,12 @@ static int v4l2_open(struct inode *inode, struct file *filp)
         }
 
 err:
-        /* decrease the refcount in case of an error */
-        if (ret)
-                video_put(vdev);
         if (vdev->debug)
                 printk(KERN_DEBUG "%s: open (%d)\n",
                         video_device_node_name(vdev), ret);
+        /* decrease the refcount in case of an error */
+        if (ret)
+                video_put(vdev);
         return ret;
 }
 
@@ -500,12 +500,12 @@ static int v4l2_release(struct inode *inode, struct file *filp)
                 if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags))
                         mutex_unlock(vdev->lock);
         }
-        /* decrease the refcount unconditionally since the release()
-           return value is ignored. */
-        video_put(vdev);
         if (vdev->debug)
                 printk(KERN_DEBUG "%s: release\n",
                         video_device_node_name(vdev));
+        /* decrease the refcount unconditionally since the release()
+           return value is ignored. */
+        video_put(vdev);
         return ret;
 }
 
@@ -697,7 +697,8 @@ static void determine_valid_ioctls(struct video_device *vdev)
         SET_VALID_IOCTL(ops, VIDIOC_TRY_ENCODER_CMD, vidioc_try_encoder_cmd);
         SET_VALID_IOCTL(ops, VIDIOC_DECODER_CMD, vidioc_decoder_cmd);
         SET_VALID_IOCTL(ops, VIDIOC_TRY_DECODER_CMD, vidioc_try_decoder_cmd);
-        if (ops->vidioc_g_parm || vdev->vfl_type == VFL_TYPE_GRABBER)
+        if (ops->vidioc_g_parm || (vdev->vfl_type == VFL_TYPE_GRABBER &&
+                                        (ops->vidioc_g_std || vdev->tvnorms)))
                 set_bit(_IOC_NR(VIDIOC_G_PARM), valid_ioctls);
         SET_VALID_IOCTL(ops, VIDIOC_S_PARM, vidioc_s_parm);
         SET_VALID_IOCTL(ops, VIDIOC_G_TUNER, vidioc_g_tuner);
@@ -729,6 +730,8 @@ static void determine_valid_ioctls(struct video_device *vdev)
         SET_VALID_IOCTL(ops, VIDIOC_UNSUBSCRIBE_EVENT, vidioc_unsubscribe_event);
         SET_VALID_IOCTL(ops, VIDIOC_CREATE_BUFS, vidioc_create_bufs);
         SET_VALID_IOCTL(ops, VIDIOC_PREPARE_BUF, vidioc_prepare_buf);
+        if (ops->vidioc_enum_freq_bands || ops->vidioc_g_tuner || ops->vidioc_g_modulator)
+                set_bit(_IOC_NR(VIDIOC_ENUM_FREQ_BANDS), valid_ioctls);
         bitmap_andnot(vdev->valid_ioctls, valid_ioctls, vdev->valid_ioctls,
                         BASE_VIDIOC_PRIVATE);
 }
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 4b4059d64272..c3b7b5f59b32 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -825,6 +825,17 @@ static void v4l_print_sliced_vbi_cap(const void *arg, bool write_only)
                                 p->service_lines[1][i]);
 }
 
+static void v4l_print_freq_band(const void *arg, bool write_only)
+{
+        const struct v4l2_frequency_band *p = arg;
+
+        pr_cont("tuner=%u, type=%u, index=%u, capability=0x%x, "
+                        "rangelow=%u, rangehigh=%u, modulation=0x%x\n",
+                        p->tuner, p->type, p->index,
+                        p->capability, p->rangelow,
+                        p->rangehigh, p->modulation);
+}
+
 static void v4l_print_u32(const void *arg, bool write_only)
 {
         pr_cont("value=%u\n", *(const u32 *)arg);
@@ -1245,10 +1256,14 @@ static int v4l_g_tuner(const struct v4l2_ioctl_ops *ops,
 {
         struct video_device *vfd = video_devdata(file);
         struct v4l2_tuner *p = arg;
+        int err;
 
         p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
                         V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
-        return ops->vidioc_g_tuner(file, fh, p);
+        err = ops->vidioc_g_tuner(file, fh, p);
+        if (!err)
+                p->capability |= V4L2_TUNER_CAP_FREQ_BANDS;
+        return err;
 }
 
 static int v4l_s_tuner(const struct v4l2_ioctl_ops *ops,
@@ -1262,6 +1277,18 @@ static int v4l_s_tuner(const struct v4l2_ioctl_ops *ops,
         return ops->vidioc_s_tuner(file, fh, p);
 }
 
+static int v4l_g_modulator(const struct v4l2_ioctl_ops *ops,
+                                struct file *file, void *fh, void *arg)
+{
+        struct v4l2_modulator *p = arg;
+        int err;
+
+        err = ops->vidioc_g_modulator(file, fh, p);
+        if (!err)
+                p->capability |= V4L2_TUNER_CAP_FREQ_BANDS;
+        return err;
+}
+
 static int v4l_g_frequency(const struct v4l2_ioctl_ops *ops,
                                 struct file *file, void *fh, void *arg)
 {
@@ -1486,7 +1513,8 @@ static int v4l_queryctrl(const struct v4l2_ioctl_ops *ops,
 {
         struct video_device *vfd = video_devdata(file);
         struct v4l2_queryctrl *p = arg;
-        struct v4l2_fh *vfh = fh;
+        struct v4l2_fh *vfh =
+                test_bit(V4L2_FL_USES_V4L2_FH, &vfd->flags) ? fh : NULL;
 
         if (vfh && vfh->ctrl_handler)
                 return v4l2_queryctrl(vfh->ctrl_handler, p);
@@ -1502,7 +1530,8 @@ static int v4l_querymenu(const struct v4l2_ioctl_ops *ops,
 {
         struct video_device *vfd = video_devdata(file);
         struct v4l2_querymenu *p = arg;
-        struct v4l2_fh *vfh = fh;
+        struct v4l2_fh *vfh =
+                test_bit(V4L2_FL_USES_V4L2_FH, &vfd->flags) ? fh : NULL;
 
         if (vfh && vfh->ctrl_handler)
                 return v4l2_querymenu(vfh->ctrl_handler, p);
@@ -1518,7 +1547,8 @@ static int v4l_g_ctrl(const struct v4l2_ioctl_ops *ops,
 {
         struct video_device *vfd = video_devdata(file);
         struct v4l2_control *p = arg;
-        struct v4l2_fh *vfh = fh;
+        struct v4l2_fh *vfh =
+                test_bit(V4L2_FL_USES_V4L2_FH, &vfd->flags) ? fh : NULL;
         struct v4l2_ext_controls ctrls;
         struct v4l2_ext_control ctrl;
 
@@ -1551,7 +1581,8 @@ static int v4l_s_ctrl(const struct v4l2_ioctl_ops *ops,
 {
         struct video_device *vfd = video_devdata(file);
         struct v4l2_control *p = arg;
-        struct v4l2_fh *vfh = fh;
+        struct v4l2_fh *vfh =
+                test_bit(V4L2_FL_USES_V4L2_FH, &vfd->flags) ? fh : NULL;
         struct v4l2_ext_controls ctrls;
         struct v4l2_ext_control ctrl;
 
@@ -1579,7 +1610,8 @@ static int v4l_g_ext_ctrls(const struct v4l2_ioctl_ops *ops,
 {
         struct video_device *vfd = video_devdata(file);
         struct v4l2_ext_controls *p = arg;
-        struct v4l2_fh *vfh = fh;
+        struct v4l2_fh *vfh =
+                test_bit(V4L2_FL_USES_V4L2_FH, &vfd->flags) ? fh : NULL;
 
         p->error_idx = p->count;
         if (vfh && vfh->ctrl_handler)
@@ -1597,7 +1629,8 @@ static int v4l_s_ext_ctrls(const struct v4l2_ioctl_ops *ops,
 {
         struct video_device *vfd = video_devdata(file);
         struct v4l2_ext_controls *p = arg;
-        struct v4l2_fh *vfh = fh;
+        struct v4l2_fh *vfh =
+                test_bit(V4L2_FL_USES_V4L2_FH, &vfd->flags) ? fh : NULL;
 
         p->error_idx = p->count;
         if (vfh && vfh->ctrl_handler)
@@ -1615,7 +1648,8 @@ static int v4l_try_ext_ctrls(const struct v4l2_ioctl_ops *ops,
 {
         struct video_device *vfd = video_devdata(file);
         struct v4l2_ext_controls *p = arg;
-        struct v4l2_fh *vfh = fh;
+        struct v4l2_fh *vfh =
+                test_bit(V4L2_FL_USES_V4L2_FH, &vfd->flags) ? fh : NULL;
 
         p->error_idx = p->count;
         if (vfh && vfh->ctrl_handler)
@@ -1798,6 +1832,57 @@ static int v4l_g_sliced_vbi_cap(const struct v4l2_ioctl_ops *ops,
         return ops->vidioc_g_sliced_vbi_cap(file, fh, p);
 }
 
+static int v4l_enum_freq_bands(const struct v4l2_ioctl_ops *ops,
+                                struct file *file, void *fh, void *arg)
+{
+        struct video_device *vfd = video_devdata(file);
+        struct v4l2_frequency_band *p = arg;
+        enum v4l2_tuner_type type;
+        int err;
+
+        type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
+                        V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
+
+        if (type != p->type)
+                return -EINVAL;
+        if (ops->vidioc_enum_freq_bands)
+                return ops->vidioc_enum_freq_bands(file, fh, p);
+        if (ops->vidioc_g_tuner) {
+                struct v4l2_tuner t = {
+                        .index = p->tuner,
+                        .type = type,
+                };
+
+                err = ops->vidioc_g_tuner(file, fh, &t);
+                if (err)
+                        return err;
+                p->capability = t.capability | V4L2_TUNER_CAP_FREQ_BANDS;
+                p->rangelow = t.rangelow;
+                p->rangehigh = t.rangehigh;
+                p->modulation = (type == V4L2_TUNER_RADIO) ?
+                        V4L2_BAND_MODULATION_FM : V4L2_BAND_MODULATION_VSB;
+                return 0;
+        }
+        if (ops->vidioc_g_modulator) {
+                struct v4l2_modulator m = {
+                        .index = p->tuner,
+                };
+
+                if (type != V4L2_TUNER_RADIO)
+                        return -EINVAL;
+                err = ops->vidioc_g_modulator(file, fh, &m);
+                if (err)
+                        return err;
+                p->capability = m.capability | V4L2_TUNER_CAP_FREQ_BANDS;
+                p->rangelow = m.rangelow;
+                p->rangehigh = m.rangehigh;
+                p->modulation = (type == V4L2_TUNER_RADIO) ?
+                        V4L2_BAND_MODULATION_FM : V4L2_BAND_MODULATION_VSB;
+                return 0;
+        }
+        return -ENOTTY;
+}
+
 struct v4l2_ioctl_info {
         unsigned int ioctl;
         u32 flags;
@@ -1806,7 +1891,7 @@ struct v4l2_ioctl_info {
                 u32 offset;
                 int (*func)(const struct v4l2_ioctl_ops *ops,
                                 struct file *file, void *fh, void *p);
-        };
+        } u;
         void (*debug)(const void *arg, bool write_only);
 };
 
@@ -1831,9 +1916,7 @@ struct v4l2_ioctl_info {
                 .ioctl = _ioctl,                                        \
                 .flags = _flags | INFO_FL_STD,                          \
                 .name = #_ioctl,                                        \
-                {                                                       \
-                        .offset = offsetof(struct v4l2_ioctl_ops, _vidioc),\
-                },                                                      \
+                .u.offset = offsetof(struct v4l2_ioctl_ops, _vidioc),   \
                 .debug = _debug,                                        \
         }
 
@@ -1842,9 +1925,7 @@ struct v4l2_ioctl_info {
                 .ioctl = _ioctl,                                        \
                 .flags = _flags | INFO_FL_FUNC,                         \
                 .name = #_ioctl,                                        \
-                {                                                       \
-                        .func = _func,                                  \
-                },                                                      \
+                .u.func = _func,                                        \
                 .debug = _debug,                                        \
         }
 
@@ -1883,7 +1964,7 @@ static struct v4l2_ioctl_info v4l2_ioctls[] = {
         IOCTL_INFO_FNC(VIDIOC_ENUMOUTPUT, v4l_enumoutput, v4l_print_enumoutput, INFO_FL_CLEAR(v4l2_output, index)),
         IOCTL_INFO_STD(VIDIOC_G_AUDOUT, vidioc_g_audout, v4l_print_audioout, 0),
         IOCTL_INFO_STD(VIDIOC_S_AUDOUT, vidioc_s_audout, v4l_print_audioout, INFO_FL_PRIO),
-        IOCTL_INFO_STD(VIDIOC_G_MODULATOR, vidioc_g_modulator, v4l_print_modulator, INFO_FL_CLEAR(v4l2_modulator, index)),
+        IOCTL_INFO_FNC(VIDIOC_G_MODULATOR, v4l_g_modulator, v4l_print_modulator, INFO_FL_CLEAR(v4l2_modulator, index)),
         IOCTL_INFO_STD(VIDIOC_S_MODULATOR, vidioc_s_modulator, v4l_print_modulator, INFO_FL_PRIO),
         IOCTL_INFO_FNC(VIDIOC_G_FREQUENCY, v4l_g_frequency, v4l_print_frequency, INFO_FL_CLEAR(v4l2_frequency, tuner)),
         IOCTL_INFO_FNC(VIDIOC_S_FREQUENCY, v4l_s_frequency, v4l_print_frequency, INFO_FL_PRIO),
@@ -1904,7 +1985,7 @@ static struct v4l2_ioctl_info v4l2_ioctls[] = {
         IOCTL_INFO_FNC(VIDIOC_LOG_STATUS, v4l_log_status, v4l_print_newline, 0),
         IOCTL_INFO_FNC(VIDIOC_G_EXT_CTRLS, v4l_g_ext_ctrls, v4l_print_ext_controls, INFO_FL_CTRL),
         IOCTL_INFO_FNC(VIDIOC_S_EXT_CTRLS, v4l_s_ext_ctrls, v4l_print_ext_controls, INFO_FL_PRIO | INFO_FL_CTRL),
-        IOCTL_INFO_FNC(VIDIOC_TRY_EXT_CTRLS, v4l_try_ext_ctrls, v4l_print_ext_controls, 0),
+        IOCTL_INFO_FNC(VIDIOC_TRY_EXT_CTRLS, v4l_try_ext_ctrls, v4l_print_ext_controls, INFO_FL_CTRL),
         IOCTL_INFO_STD(VIDIOC_ENUM_FRAMESIZES, vidioc_enum_framesizes, v4l_print_frmsizeenum, INFO_FL_CLEAR(v4l2_frmsizeenum, pixel_format)),
         IOCTL_INFO_STD(VIDIOC_ENUM_FRAMEINTERVALS, vidioc_enum_frameintervals, v4l_print_frmivalenum, INFO_FL_CLEAR(v4l2_frmivalenum, height)),
         IOCTL_INFO_STD(VIDIOC_G_ENC_INDEX, vidioc_g_enc_index, v4l_print_enc_idx, 0),
@@ -1929,7 +2010,8 @@ static struct v4l2_ioctl_info v4l2_ioctls[] = {
         IOCTL_INFO_FNC(VIDIOC_PREPARE_BUF, v4l_prepare_buf, v4l_print_buffer, INFO_FL_QUEUE),
         IOCTL_INFO_STD(VIDIOC_ENUM_DV_TIMINGS, vidioc_enum_dv_timings, v4l_print_enum_dv_timings, 0),
         IOCTL_INFO_STD(VIDIOC_QUERY_DV_TIMINGS, vidioc_query_dv_timings, v4l_print_dv_timings, 0),
-        IOCTL_INFO_STD(VIDIOC_DV_TIMINGS_CAP, vidioc_dv_timings_cap, v4l_print_dv_timings_cap, 0),
+        IOCTL_INFO_STD(VIDIOC_DV_TIMINGS_CAP, vidioc_dv_timings_cap, v4l_print_dv_timings_cap, INFO_FL_CLEAR(v4l2_dv_timings_cap, type)),
+        IOCTL_INFO_FNC(VIDIOC_ENUM_FREQ_BANDS, v4l_enum_freq_bands, v4l_print_freq_band, 0),
 };
 #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
 
@@ -2042,11 +2124,11 @@ static long __video_do_ioctl(struct file *file,
         if (info->flags & INFO_FL_STD) {
                 typedef int (*vidioc_op)(struct file *file, void *fh, void *p);
                 const void *p = vfd->ioctl_ops;
-                const vidioc_op *vidioc = p + info->offset;
+                const vidioc_op *vidioc = p + info->u.offset;
 
                 ret = (*vidioc)(file, fh, arg);
         } else if (info->flags & INFO_FL_FUNC) {
-                ret = info->func(ops, file, fh, arg);
+                ret = info->u.func(ops, file, fh, arg);
         } else if (!ops->vidioc_default) {
                 ret = -ENOTTY;
         } else {
diff --git a/drivers/media/video/v4l2-mem2mem.c b/drivers/media/video/v4l2-mem2mem.c
index 975d0fa938c6..97b48318aee1 100644
--- a/drivers/media/video/v4l2-mem2mem.c
+++ b/drivers/media/video/v4l2-mem2mem.c
@@ -19,6 +19,9 @@
 
 #include <media/videobuf2-core.h>
 #include <media/v4l2-mem2mem.h>
+#include <media/v4l2-dev.h>
+#include <media/v4l2-fh.h>
+#include <media/v4l2-event.h>
 
 MODULE_DESCRIPTION("Mem to mem device framework for videobuf");
 MODULE_AUTHOR("Pawel Osciak, <pawel@osciak.com>");
@@ -407,11 +410,24 @@ EXPORT_SYMBOL_GPL(v4l2_m2m_streamoff);
 unsigned int v4l2_m2m_poll(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
                            struct poll_table_struct *wait)
 {
+        struct video_device *vfd = video_devdata(file);
+        unsigned long req_events = poll_requested_events(wait);
         struct vb2_queue *src_q, *dst_q;
         struct vb2_buffer *src_vb = NULL, *dst_vb = NULL;
         unsigned int rc = 0;
         unsigned long flags;
 
+        if (test_bit(V4L2_FL_USES_V4L2_FH, &vfd->flags)) {
+                struct v4l2_fh *fh = file->private_data;
+
+                if (v4l2_event_pending(fh))
+                        rc = POLLPRI;
+                else if (req_events & POLLPRI)
+                        poll_wait(file, &fh->wait, wait);
+                if (!(req_events & (POLLOUT | POLLWRNORM | POLLIN | POLLRDNORM)))
+                        return rc;
+        }
+
         src_q = v4l2_m2m_get_src_vq(m2m_ctx);
         dst_q = v4l2_m2m_get_dst_vq(m2m_ctx);
 
@@ -422,7 +438,7 @@ unsigned int v4l2_m2m_poll(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
          */
         if ((!src_q->streaming || list_empty(&src_q->queued_list))
                 && (!dst_q->streaming || list_empty(&dst_q->queued_list))) {
-                rc = POLLERR;
+                rc |= POLLERR;
                 goto end;
         }
 
diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c
index 308e150a39bc..eb404c2ce270 100644
--- a/drivers/media/video/via-camera.c
+++ b/drivers/media/video/via-camera.c
@@ -963,7 +963,7 @@ static int viacam_do_try_fmt(struct via_camera *cam,
 
         upix->pixelformat = f->pixelformat;
         viacam_fmt_pre(upix, spix);
-        v4l2_fill_mbus_format(&mbus_fmt, upix, f->mbus_code);
+        v4l2_fill_mbus_format(&mbus_fmt, spix, f->mbus_code);
         ret = sensor_call(cam, video, try_mbus_fmt, &mbus_fmt);
         v4l2_fill_pix_format(spix, &mbus_fmt);
         viacam_fmt_post(upix, spix);
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c
index 9b9a06fdd0f0..3a43ba0959bf 100644
--- a/drivers/media/video/videobuf-dma-contig.c
+++ b/drivers/media/video/videobuf-dma-contig.c
@@ -56,7 +56,7 @@ static int __videobuf_dc_alloc(struct device *dev,
                                 dev_err(dev, "dma_map_single failed\n");
 
                                 free_pages_exact(mem->vaddr, mem->size);
-                                mem->vaddr = 0;
+                                mem->vaddr = NULL;
                                 return err;
                         }
                 }
@@ -359,32 +359,43 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
         size = vma->vm_end - vma->vm_start;
         size = (size < mem->size) ? size : mem->size;
 
-        if (!mem->cached)
+        if (!mem->cached) {
                 vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-
-        pos = (unsigned long)mem->vaddr;
-
-        while (size > 0) {
-                page = virt_to_page((void *)pos);
-                if (NULL == page) {
-                        dev_err(q->dev, "mmap: virt_to_page failed\n");
-                        __videobuf_dc_free(q->dev, mem);
-                        goto error;
-                }
-                retval = vm_insert_page(vma, start, page);
+                retval = remap_pfn_range(vma, vma->vm_start,
+                         mem->dma_handle >> PAGE_SHIFT,
+                                 size, vma->vm_page_prot);
                 if (retval) {
-                        dev_err(q->dev, "mmap: insert failed with error %d\n",
-                                retval);
-                        __videobuf_dc_free(q->dev, mem);
+                        dev_err(q->dev, "mmap: remap failed with error %d. ",
+                                                                retval);
+                        dma_free_coherent(q->dev, mem->size,
+                                        mem->vaddr, mem->dma_handle);
                         goto error;
                 }
-                start += PAGE_SIZE;
-                pos += PAGE_SIZE;
+        } else {
+                pos = (unsigned long)mem->vaddr;
 
-                if (size > PAGE_SIZE)
-                        size -= PAGE_SIZE;
-                else
-                        size = 0;
+                while (size > 0) {
+                        page = virt_to_page((void *)pos);
+                        if (NULL == page) {
+                                dev_err(q->dev, "mmap: virt_to_page failed\n");
+                                __videobuf_dc_free(q->dev, mem);
+                                goto error;
+                        }
+                        retval = vm_insert_page(vma, start, page);
+                        if (retval) {
+                                dev_err(q->dev, "mmap: insert failed with error %d\n",
+                                        retval);
+                                __videobuf_dc_free(q->dev, mem);
+                                goto error;
+                        }
+                        start += PAGE_SIZE;
+                        pos += PAGE_SIZE;
+
+                        if (size > PAGE_SIZE)
+                                size -= PAGE_SIZE;
+                        else
+                                size = 0;
+                }
         }
 
         vma->vm_ops = &videobuf_vm_ops;
diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c
index 4e0290ab5071..268c7dd4f823 100644
--- a/drivers/media/video/videobuf2-core.c
+++ b/drivers/media/video/videobuf2-core.c
@@ -715,8 +715,8 @@ static int __create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create
 }
 
 /**
- * vb2_reqbufs() - Wrapper for __reqbufs() that also verifies the memory and
- * type values.
+ * vb2_create_bufs() - Wrapper for __create_bufs() that also verifies the
+ * memory and type values.
  * @q:          videobuf2 queue
  * @create:     creation parameters, passed from userspace to vidioc_create_bufs
  *              handler in driver
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 1e8c4f3ab602..a05494b71b20 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -230,7 +230,6 @@ struct vivi_dev {
         struct vivi_fmt            *fmt;
         unsigned int               width, height;
         struct vb2_queue           vb_vidq;
-        enum v4l2_field            field;
         unsigned int               field_count;
 
         u8                         bars[9][3];
@@ -623,7 +622,7 @@ static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf)
 
         dev->mv_count += 2;
 
-        buf->vb.v4l2_buf.field = dev->field;
+        buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED;
         dev->field_count++;
         buf->vb.v4l2_buf.sequence = dev->field_count >> 1;
         do_gettimeofday(&ts);
@@ -925,7 +924,7 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
 
         f->fmt.pix.width        = dev->width;
         f->fmt.pix.height       = dev->height;
-        f->fmt.pix.field        = dev->field;
+        f->fmt.pix.field        = V4L2_FIELD_INTERLACED;
         f->fmt.pix.pixelformat  = dev->fmt->fourcc;
         f->fmt.pix.bytesperline =
                 (f->fmt.pix.width * dev->fmt->depth) >> 3;
@@ -944,25 +943,16 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
 {
         struct vivi_dev *dev = video_drvdata(file);
         struct vivi_fmt *fmt;
-        enum v4l2_field field;
 
         fmt = get_format(f);
         if (!fmt) {
-                dprintk(dev, 1, "Fourcc format (0x%08x) invalid.\n",
+                dprintk(dev, 1, "Fourcc format (0x%08x) unknown.\n",
                         f->fmt.pix.pixelformat);
-                return -EINVAL;
-        }
-
-        field = f->fmt.pix.field;
-
-        if (field == V4L2_FIELD_ANY) {
-                field = V4L2_FIELD_INTERLACED;
-        } else if (V4L2_FIELD_INTERLACED != field) {
-                dprintk(dev, 1, "Field type invalid.\n");
-                return -EINVAL;
+                f->fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
+                fmt = get_format(f);
         }
 
-        f->fmt.pix.field = field;
+        f->fmt.pix.field = V4L2_FIELD_INTERLACED;
         v4l_bound_align_image(&f->fmt.pix.width, 48, MAX_WIDTH, 2,
                               &f->fmt.pix.height, 32, MAX_HEIGHT, 0, 0);
         f->fmt.pix.bytesperline =
@@ -996,7 +986,6 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
         dev->pixelsize = dev->fmt->depth / 8;
         dev->width = f->fmt.pix.width;
         dev->height = f->fmt.pix.height;
-        dev->field = f->fmt.pix.field;
 
         return 0;
 }
@@ -1330,9 +1319,6 @@ static int __init vivi_create_instance(int inst)
         /* Now that everything is fine, let's add it to device list */
         list_add_tail(&dev->vivi_devlist, &vivi_devlist);
 
-        if (video_nr != -1)
-                video_nr++;
-
         v4l2_info(&dev->v4l2_dev, "V4L2 device registered as %s\n",
                   video_device_node_name(vfd));
         return 0;
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 4276aab4f196..78fca2902c8d 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -409,8 +409,6 @@ static irqreturn_t ab3100_irq_handler(int irq, void *data)
         u32 fatevent;
         int err;
 
-        add_interrupt_randomness(irq);
-
         err = ab3100_get_register_page_interruptible(ab3100, AB3100_EVENTA1,
                                        event_regs, 3);
         if (err)
@@ -936,8 +934,6 @@ static int __devinit ab3100_probe(struct i2c_client *client,
                                         IRQF_ONESHOT, "ab3100-core", ab3100);
         if (err)
                 goto exit_no_irq;
-        /* This real unpredictable IRQ is of course sampled for entropy */
-        rand_initialize_irq(client->irq);
 
         err = abx500_register_ops(&client->dev, &ab3100_ops);
         if (err)
diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c
index 93d5fdf020c7..da2691f22e11 100644
--- a/drivers/mfd/tps65010.c
+++ b/drivers/mfd/tps65010.c
@@ -563,8 +563,7 @@ static int tps65010_probe(struct i2c_client *client,
          */
         if (client->irq > 0) {
                 status = request_irq(client->irq, tps65010_irq,
-                        IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_FALLING,
-                        DRIVER_NAME, tps);
+                                     IRQF_TRIGGER_FALLING, DRIVER_NAME, tps);
                 if (status < 0) {
                         dev_dbg(&client->dev, "can't get IRQ %d, err %d\n",
                                         client->irq, status);
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index b012efd29e01..1c32afed28aa 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -717,8 +717,9 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                 static struct regulator_consumer_supply usb1v8 = {
                         .supply =       "usb1v8",
                 };
-                static struct regulator_consumer_supply usb3v1 = {
-                        .supply =       "usb3v1",
+                static struct regulator_consumer_supply usb3v1[] = {
+                        { .supply =     "usb3v1" },
+                        { .supply =     "bci3v1" },
                 };
 
         /* First add the regulators so that they can be used by transceiver */
@@ -746,7 +747,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                                 return PTR_ERR(child);
 
                         child = add_regulator_linked(TWL4030_REG_VUSB3V1,
-                                                      &usb_fixed, &usb3v1, 1,
+                                                      &usb_fixed, usb3v1, 2,
                                                       features);
                         if (IS_ERR(child))
                                 return PTR_ERR(child);
@@ -767,7 +768,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                 if (twl_has_regulator() && child) {
                         usb1v5.dev_name = dev_name(child);
                         usb1v8.dev_name = dev_name(child);
-                        usb3v1.dev_name = dev_name(child);
+                        usb3v1[0].dev_name = dev_name(child);
                 }
         }
         if (twl_has_usb() && pdata->usb && twl_class_is_6030()) {
diff --git a/drivers/mfd/wm831x-otp.c b/drivers/mfd/wm831x-otp.c
index f742745ff354..b90f3e06b6c9 100644
--- a/drivers/mfd/wm831x-otp.c
+++ b/drivers/mfd/wm831x-otp.c
@@ -18,6 +18,7 @@
 #include <linux/bcd.h>
 #include <linux/delay.h>
 #include <linux/mfd/core.h>
+#include <linux/random.h>
 
 #include <linux/mfd/wm831x/core.h>
 #include <linux/mfd/wm831x/otp.h>
@@ -66,6 +67,7 @@ static DEVICE_ATTR(unique_id, 0444, wm831x_unique_id_show, NULL);
 
 int wm831x_otp_init(struct wm831x *wm831x)
 {
+        char uuid[WM831X_UNIQUE_ID_LEN];
         int ret;
 
         ret = device_create_file(wm831x->dev, &dev_attr_unique_id);
@@ -73,6 +75,12 @@ int wm831x_otp_init(struct wm831x *wm831x)
                 dev_err(wm831x->dev, "Unique ID attribute not created: %d\n",
                         ret);
 
+        ret = wm831x_unique_id_read(wm831x, uuid);
+        if (ret == 0)
+                add_device_randomness(uuid, sizeof(uuid));
+        else
+                dev_err(wm831x->dev, "Failed to read UUID: %d\n", ret);
+
         return ret;
 }
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 9aaf863b4237..dd451c3dd83d 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -9360,8 +9360,7 @@ static int __devinit bnx2x_prev_mark_path(struct bnx2x *bp)
         struct bnx2x_prev_path_list *tmp_list;
         int rc;
 
-        tmp_list = (struct bnx2x_prev_path_list *)
-                    kmalloc(sizeof(struct bnx2x_prev_path_list), GFP_KERNEL);
+        tmp_list = kmalloc(sizeof(struct bnx2x_prev_path_list), GFP_KERNEL);
         if (!tmp_list) {
                 BNX2X_ERR("Failed to allocate 'bnx2x_prev_path_list'\n");
                 return -ENOMEM;
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 9a009fd6ea1b..bf906c51d82a 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -92,7 +92,7 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits)
 
 #define DRV_MODULE_NAME         "tg3"
 #define TG3_MAJ_NUM                     3
-#define TG3_MIN_NUM                     123
+#define TG3_MIN_NUM                     124
 #define DRV_MODULE_VERSION      \
         __stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM)
 #define DRV_MODULE_RELDATE      "March 21, 2012"
@@ -672,6 +672,12 @@ static int tg3_ape_lock(struct tg3 *tp, int locknum)
                 else
                         bit = 1 << tp->pci_fn;
                 break;
+        case TG3_APE_LOCK_PHY0:
+        case TG3_APE_LOCK_PHY1:
+        case TG3_APE_LOCK_PHY2:
+        case TG3_APE_LOCK_PHY3:
+                bit = APE_LOCK_REQ_DRIVER;
+                break;
         default:
                 return -EINVAL;
         }
@@ -723,6 +729,12 @@ static void tg3_ape_unlock(struct tg3 *tp, int locknum)
                 else
                         bit = 1 << tp->pci_fn;
                 break;
+        case TG3_APE_LOCK_PHY0:
+        case TG3_APE_LOCK_PHY1:
+        case TG3_APE_LOCK_PHY2:
+        case TG3_APE_LOCK_PHY3:
+                bit = APE_LOCK_GRANT_DRIVER;
+                break;
         default:
                 return;
         }
@@ -1052,6 +1064,8 @@ static int tg3_readphy(struct tg3 *tp, int reg, u32 *val)
                 udelay(80);
         }
 
+        tg3_ape_lock(tp, tp->phy_ape_lock);
+
         *val = 0x0;
 
         frame_val  = ((tp->phy_addr << MI_COM_PHY_ADDR_SHIFT) &
@@ -1086,6 +1100,8 @@ static int tg3_readphy(struct tg3 *tp, int reg, u32 *val)
                 udelay(80);
         }
 
+        tg3_ape_unlock(tp, tp->phy_ape_lock);
+
         return ret;
 }
 
@@ -1105,6 +1121,8 @@ static int tg3_writephy(struct tg3 *tp, int reg, u32 val)
                 udelay(80);
         }
 
+        tg3_ape_lock(tp, tp->phy_ape_lock);
+
         frame_val  = ((tp->phy_addr << MI_COM_PHY_ADDR_SHIFT) &
                       MI_COM_PHY_ADDR_MASK);
         frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
@@ -1135,6 +1153,8 @@ static int tg3_writephy(struct tg3 *tp, int reg, u32 val)
                 udelay(80);
         }
 
+        tg3_ape_unlock(tp, tp->phy_ape_lock);
+
         return ret;
 }
 
@@ -9066,8 +9086,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780 ||
             tg3_flag(tp, 57765_PLUS)) {
                 val = tr32(TG3_RDMA_RSRVCTRL_REG);
-                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
-                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5720) {
+                if (tp->pci_chip_rev_id == CHIPREV_ID_5719_A0) {
                         val &= ~(TG3_RDMA_RSRVCTRL_TXMRGN_MASK |
                                  TG3_RDMA_RSRVCTRL_FIFO_LWM_MASK |
                                  TG3_RDMA_RSRVCTRL_FIFO_HWM_MASK);
@@ -9257,6 +9276,19 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         tw32_f(RDMAC_MODE, rdmac_mode);
         udelay(40);
 
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) {
+                for (i = 0; i < TG3_NUM_RDMA_CHANNELS; i++) {
+                        if (tr32(TG3_RDMA_LENGTH + (i << 2)) > TG3_MAX_MTU(tp))
+                                break;
+                }
+                if (i < TG3_NUM_RDMA_CHANNELS) {
+                        val = tr32(TG3_LSO_RD_DMA_CRPTEN_CTRL);
+                        val |= TG3_LSO_RD_DMA_TX_LENGTH_WA;
+                        tw32(TG3_LSO_RD_DMA_CRPTEN_CTRL, val);
+                        tg3_flag_set(tp, 5719_RDMA_BUG);
+                }
+        }
+
         tw32(RCVDCC_MODE, RCVDCC_MODE_ENABLE | RCVDCC_MODE_ATTN_ENABLE);
         if (!tg3_flag(tp, 5705_PLUS))
                 tw32(MBFREE_MODE, MBFREE_MODE_ENABLE);
@@ -9616,6 +9648,16 @@ static void tg3_periodic_fetch_stats(struct tg3 *tp)
         TG3_STAT_ADD32(&sp->tx_ucast_packets, MAC_TX_STATS_UCAST);
         TG3_STAT_ADD32(&sp->tx_mcast_packets, MAC_TX_STATS_MCAST);
         TG3_STAT_ADD32(&sp->tx_bcast_packets, MAC_TX_STATS_BCAST);
+        if (unlikely(tg3_flag(tp, 5719_RDMA_BUG) &&
+                     (sp->tx_ucast_packets.low + sp->tx_mcast_packets.low +
+                      sp->tx_bcast_packets.low) > TG3_NUM_RDMA_CHANNELS)) {
+                u32 val;
+
+                val = tr32(TG3_LSO_RD_DMA_CRPTEN_CTRL);
+                val &= ~TG3_LSO_RD_DMA_TX_LENGTH_WA;
+                tw32(TG3_LSO_RD_DMA_CRPTEN_CTRL, val);
+                tg3_flag_clear(tp, 5719_RDMA_BUG);
+        }
 
         TG3_STAT_ADD32(&sp->rx_octets, MAC_RX_STATS_OCTETS);
         TG3_STAT_ADD32(&sp->rx_fragments, MAC_RX_STATS_FRAGMENTS);
@@ -12482,10 +12524,12 @@ static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *dev,
 {
         struct tg3 *tp = netdev_priv(dev);
 
-        if (!tp->hw_stats)
+        spin_lock_bh(&tp->lock);
+        if (!tp->hw_stats) {
+                spin_unlock_bh(&tp->lock);
                 return &tp->net_stats_prev;
+        }
 
-        spin_lock_bh(&tp->lock);
         tg3_get_nstats(tp, stats);
         spin_unlock_bh(&tp->lock);
 
@@ -13648,6 +13692,23 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
         tg3_flag_set(tp, PAUSE_AUTONEG);
         tp->link_config.flowctrl = FLOW_CTRL_TX | FLOW_CTRL_RX;
 
+        if (tg3_flag(tp, ENABLE_APE)) {
+                switch (tp->pci_fn) {
+                case 0:
+                        tp->phy_ape_lock = TG3_APE_LOCK_PHY0;
+                        break;
+                case 1:
+                        tp->phy_ape_lock = TG3_APE_LOCK_PHY1;
+                        break;
+                case 2:
+                        tp->phy_ape_lock = TG3_APE_LOCK_PHY2;
+                        break;
+                case 3:
+                        tp->phy_ape_lock = TG3_APE_LOCK_PHY3;
+                        break;
+                }
+        }
+
         if (tg3_flag(tp, USE_PHYLIB))
                 return tg3_phy_init(tp);
 
diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
index a1b75cd67b9d..6d52cb286826 100644
--- a/drivers/net/ethernet/broadcom/tg3.h
+++ b/drivers/net/ethernet/broadcom/tg3.h
@@ -1376,7 +1376,11 @@
 #define TG3_LSO_RD_DMA_CRPTEN_CTRL      0x00004910
 #define TG3_LSO_RD_DMA_CRPTEN_CTRL_BLEN_BD_4K    0x00030000
 #define TG3_LSO_RD_DMA_CRPTEN_CTRL_BLEN_LSO_4K   0x000c0000
-/* 0x4914 --> 0x4c00 unused */
+#define TG3_LSO_RD_DMA_TX_LENGTH_WA      0x02000000
+/* 0x4914 --> 0x4be0 unused */
+
+#define TG3_NUM_RDMA_CHANNELS           4
+#define TG3_RDMA_LENGTH                 0x00004be0
 
 /* Write DMA control registers */
 #define WDMAC_MODE                      0x00004c00
@@ -2959,6 +2963,7 @@ enum TG3_FLAGS {
         TG3_FLAG_L1PLLPD_EN,
         TG3_FLAG_APE_HAS_NCSI,
         TG3_FLAG_4K_FIFO_LIMIT,
+        TG3_FLAG_5719_RDMA_BUG,
         TG3_FLAG_RESET_TASK_PENDING,
         TG3_FLAG_5705_PLUS,
         TG3_FLAG_IS_5788,
@@ -3107,6 +3112,7 @@ struct tg3 {
         int                             old_link;
 
         u8                              phy_addr;
+        u8                              phy_ape_lock;
 
         /* PHY info */
         u32                             phy_id;
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index 3769f5711cc3..b53a3b60b648 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -4682,6 +4682,7 @@ static int __devinit qlge_probe(struct pci_dev *pdev,
                 NETIF_F_HW_VLAN_TX | NETIF_F_RXCSUM;
         ndev->features = ndev->hw_features |
                 NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;
+        ndev->vlan_features = ndev->hw_features;
 
         if (test_bit(QL_DMA64, &qdev->flags))
                 ndev->features |= NETIF_F_HIGHDMA;
diff --git a/drivers/net/ethernet/seeq/seeq8005.c b/drivers/net/ethernet/seeq/seeq8005.c
index 698edbbfc149..d6e50de71186 100644
--- a/drivers/net/ethernet/seeq/seeq8005.c
+++ b/drivers/net/ethernet/seeq/seeq8005.c
@@ -736,9 +736,7 @@ MODULE_PARM_DESC(irq, "SEEQ 8005 IRQ number");
 int __init init_module(void)
 {
         dev_seeq = seeq8005_probe(-1);
-        if (IS_ERR(dev_seeq))
-                return PTR_ERR(dev_seeq);
-        return 0;
+        return PTR_RET(dev_seeq);
 }
 
 void __exit cleanup_module(void)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index c62163e272cd..926d4db5cb38 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1379,10 +1379,12 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
         int vnet_hdr_sz;
         int ret;
 
-        if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89)
+        if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89) {
                 if (copy_from_user(&ifr, argp, ifreq_len))
                         return -EFAULT;
-
+        } else {
+                memset(&ifr, 0, sizeof(ifr));
+        }
         if (cmd == TUNGETFEATURES) {
                 /* Currently this just means: "what IFF flags are valid?".
                  * This is needed because we never checked for invalid flags on
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index aa764ecc4e60..c1892f321c46 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -268,6 +268,7 @@ config CHARGER_GPIO
 config CHARGER_MANAGER
         bool "Battery charger manager for multiple chargers"
         depends on REGULATOR && RTC_CLASS
+        select EXTCON
         help
           Say Y to enable charger-manager support, which allows multiple
           chargers attached to a battery and multiple batteries attached to a
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index f5d6d379f2fb..181ddece5181 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -22,6 +22,7 @@
  * Datasheets:
  * http://focus.ti.com/docs/prod/folders/print/bq27000.html
  * http://focus.ti.com/docs/prod/folders/print/bq27500.html
+ * http://www.ti.com/product/bq27425-g1
  */
 
 #include <linux/module.h>
@@ -51,6 +52,7 @@
 #define BQ27x00_REG_LMD                 0x12 /* Last measured discharge */
 #define BQ27x00_REG_CYCT                0x2A /* Cycle count total */
 #define BQ27x00_REG_AE                  0x22 /* Available energy */
+#define BQ27x00_POWER_AVG               0x24
 
 #define BQ27000_REG_RSOC                0x0B /* Relative State-of-Charge */
 #define BQ27000_REG_ILMD                0x76 /* Initial last measured discharge */
@@ -66,15 +68,21 @@
 #define BQ27500_FLAG_SOCF               BIT(1) /* State-of-Charge threshold final */
 #define BQ27500_FLAG_SOC1               BIT(2) /* State-of-Charge threshold 1 */
 #define BQ27500_FLAG_FC                 BIT(9)
+#define BQ27500_FLAG_OTC                BIT(15)
+
+/* bq27425 register addresses are same as bq27x00 addresses minus 4 */
+#define BQ27425_REG_OFFSET              0x04
+#define BQ27425_REG_SOC                 0x18 /* Register address plus offset */
 
 #define BQ27000_RS                      20 /* Resistor sense */
+#define BQ27x00_POWER_CONSTANT          (256 * 29200 / 1000)
 
 struct bq27x00_device_info;
 struct bq27x00_access_methods {
         int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
 };
 
-enum bq27x00_chip { BQ27000, BQ27500 };
+enum bq27x00_chip { BQ27000, BQ27500, BQ27425};
 
 struct bq27x00_reg_cache {
         int temperature;
@@ -86,6 +94,8 @@ struct bq27x00_reg_cache {
         int capacity;
         int energy;
         int flags;
+        int power_avg;
+        int health;
 };
 
 struct bq27x00_device_info {
@@ -123,6 +133,22 @@ static enum power_supply_property bq27x00_battery_props[] = {
         POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
         POWER_SUPPLY_PROP_CYCLE_COUNT,
         POWER_SUPPLY_PROP_ENERGY_NOW,
+        POWER_SUPPLY_PROP_POWER_AVG,
+        POWER_SUPPLY_PROP_HEALTH,
+};
+
+static enum power_supply_property bq27425_battery_props[] = {
+        POWER_SUPPLY_PROP_STATUS,
+        POWER_SUPPLY_PROP_PRESENT,
+        POWER_SUPPLY_PROP_VOLTAGE_NOW,
+        POWER_SUPPLY_PROP_CURRENT_NOW,
+        POWER_SUPPLY_PROP_CAPACITY,
+        POWER_SUPPLY_PROP_CAPACITY_LEVEL,
+        POWER_SUPPLY_PROP_TEMP,
+        POWER_SUPPLY_PROP_TECHNOLOGY,
+        POWER_SUPPLY_PROP_CHARGE_FULL,
+        POWER_SUPPLY_PROP_CHARGE_NOW,
+        POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
 };
 
 static unsigned int poll_interval = 360;
@@ -137,10 +163,24 @@ MODULE_PARM_DESC(poll_interval, "battery poll interval in seconds - " \
 static inline int bq27x00_read(struct bq27x00_device_info *di, u8 reg,
                 bool single)
 {
+        if (di->chip == BQ27425)
+                return di->bus.read(di, reg - BQ27425_REG_OFFSET, single);
         return di->bus.read(di, reg, single);
 }
 
 /*
+ * Higher versions of the chip like BQ27425 and BQ27500
+ * differ from BQ27000 and BQ27200 in calculation of certain
+ * parameters. Hence we need to check for the chip type.
+ */
+static bool bq27xxx_is_chip_version_higher(struct bq27x00_device_info *di)
+{
+        if (di->chip == BQ27425 || di->chip == BQ27500)
+                return true;
+        return false;
+}
+
+/*
  * Return the battery Relative State-of-Charge
  * Or < 0 if something fails.
  */
@@ -150,6 +190,8 @@ static int bq27x00_battery_read_rsoc(struct bq27x00_device_info *di)
 
         if (di->chip == BQ27500)
                 rsoc = bq27x00_read(di, BQ27500_REG_SOC, false);
+        else if (di->chip == BQ27425)
+                rsoc = bq27x00_read(di, BQ27425_REG_SOC, false);
         else
                 rsoc = bq27x00_read(di, BQ27000_REG_RSOC, true);
 
@@ -174,7 +216,7 @@ static int bq27x00_battery_read_charge(struct bq27x00_device_info *di, u8 reg)
                 return charge;
         }
 
-        if (di->chip == BQ27500)
+        if (bq27xxx_is_chip_version_higher(di))
                 charge *= 1000;
         else
                 charge = charge * 3570 / BQ27000_RS;
@@ -208,7 +250,7 @@ static int bq27x00_battery_read_ilmd(struct bq27x00_device_info *di)
 {
         int ilmd;
 
-        if (di->chip == BQ27500)
+        if (bq27xxx_is_chip_version_higher(di))
                 ilmd = bq27x00_read(di, BQ27500_REG_DCAP, false);
         else
                 ilmd = bq27x00_read(di, BQ27000_REG_ILMD, true);
@@ -218,7 +260,7 @@ static int bq27x00_battery_read_ilmd(struct bq27x00_device_info *di)
                 return ilmd;
         }
 
-        if (di->chip == BQ27500)
+        if (bq27xxx_is_chip_version_higher(di))
                 ilmd *= 1000;
         else
                 ilmd = ilmd * 256 * 3570 / BQ27000_RS;
@@ -262,7 +304,7 @@ static int bq27x00_battery_read_temperature(struct bq27x00_device_info *di)
                 return temp;
         }
 
-        if (di->chip == BQ27500)
+        if (bq27xxx_is_chip_version_higher(di))
                 temp -= 2731;
         else
                 temp = ((temp * 5) - 5463) / 2;
@@ -306,14 +348,70 @@ static int bq27x00_battery_read_time(struct bq27x00_device_info *di, u8 reg)
         return tval * 60;
 }
 
+/*
+ * Read a power avg register.
+ * Return < 0 if something fails.
+ */
+static int bq27x00_battery_read_pwr_avg(struct bq27x00_device_info *di, u8 reg)
+{
+        int tval;
+
+        tval = bq27x00_read(di, reg, false);
+        if (tval < 0) {
+                dev_err(di->dev, "error reading power avg rgister  %02x: %d\n",
+                        reg, tval);
+                return tval;
+        }
+
+        if (di->chip == BQ27500)
+                return tval;
+        else
+                return (tval * BQ27x00_POWER_CONSTANT) / BQ27000_RS;
+}
+
+/*
+ * Read flag register.
+ * Return < 0 if something fails.
+ */
+static int bq27x00_battery_read_health(struct bq27x00_device_info *di)
+{
+        int tval;
+
+        tval = bq27x00_read(di, BQ27x00_REG_FLAGS, false);
+        if (tval < 0) {
+                dev_err(di->dev, "error reading flag register:%d\n", tval);
+                return tval;
+        }
+
+        if ((di->chip == BQ27500)) {
+                if (tval & BQ27500_FLAG_SOCF)
+                        tval = POWER_SUPPLY_HEALTH_DEAD;
+                else if (tval & BQ27500_FLAG_OTC)
+                        tval = POWER_SUPPLY_HEALTH_OVERHEAT;
+                else
+                        tval = POWER_SUPPLY_HEALTH_GOOD;
+                return tval;
+        } else {
+                if (tval & BQ27000_FLAG_EDV1)
+                        tval = POWER_SUPPLY_HEALTH_DEAD;
+                else
+                        tval = POWER_SUPPLY_HEALTH_GOOD;
+                return tval;
+        }
+
+        return -1;
+}
+
 static void bq27x00_update(struct bq27x00_device_info *di)
 {
         struct bq27x00_reg_cache cache = {0, };
         bool is_bq27500 = di->chip == BQ27500;
+        bool is_bq27425 = di->chip == BQ27425;
 
         cache.flags = bq27x00_read(di, BQ27x00_REG_FLAGS, !is_bq27500);
         if (cache.flags >= 0) {
-                if (!is_bq27500 && (cache.flags & BQ27000_FLAG_CI)) {
+                if (!is_bq27500 && !is_bq27425
+                                && (cache.flags & BQ27000_FLAG_CI)) {
                         dev_info(di->dev, "battery is not calibrated! ignoring capacity values\n");
                         cache.capacity = -ENODATA;
                         cache.energy = -ENODATA;
@@ -321,16 +419,30 @@ static void bq27x00_update(struct bq27x00_device_info *di)
                         cache.time_to_empty_avg = -ENODATA;
                         cache.time_to_full = -ENODATA;
                         cache.charge_full = -ENODATA;
+                        cache.health = -ENODATA;
                 } else {
                         cache.capacity = bq27x00_battery_read_rsoc(di);
-                        cache.energy = bq27x00_battery_read_energy(di);
-                        cache.time_to_empty = bq27x00_battery_read_time(di, BQ27x00_REG_TTE);
-                        cache.time_to_empty_avg = bq27x00_battery_read_time(di, BQ27x00_REG_TTECP);
-                        cache.time_to_full = bq27x00_battery_read_time(di, BQ27x00_REG_TTF);
+                        if (!is_bq27425) {
+                                cache.energy = bq27x00_battery_read_energy(di);
+                                cache.time_to_empty =
+                                        bq27x00_battery_read_time(di,
+                                                        BQ27x00_REG_TTE);
+                                cache.time_to_empty_avg =
+                                        bq27x00_battery_read_time(di,
+                                                        BQ27x00_REG_TTECP);
+                                cache.time_to_full =
+                                        bq27x00_battery_read_time(di,
+                                                        BQ27x00_REG_TTF);
+                        }
                         cache.charge_full = bq27x00_battery_read_lmd(di);
+                        cache.health = bq27x00_battery_read_health(di);
                 }
                 cache.temperature = bq27x00_battery_read_temperature(di);
+                if (!is_bq27425)
+                        cache.cycle_count = bq27x00_battery_read_cyct(di);
                 cache.cycle_count = bq27x00_battery_read_cyct(di);
+                cache.power_avg =
+                        bq27x00_battery_read_pwr_avg(di, BQ27x00_POWER_AVG);
 
                 /* We only have to read charge design full once */
                 if (di->charge_design_full <= 0)
@@ -376,7 +488,7 @@ static int bq27x00_battery_current(struct bq27x00_device_info *di,
                 return curr;
         }
 
-        if (di->chip == BQ27500) {
+        if (bq27xxx_is_chip_version_higher(di)) {
                 /* bq27500 returns signed value */
                 val->intval = (int)((s16)curr) * 1000;
         } else {
@@ -397,7 +509,7 @@ static int bq27x00_battery_status(struct bq27x00_device_info *di,
 {
         int status;
 
-        if (di->chip == BQ27500) {
+        if (bq27xxx_is_chip_version_higher(di)) {
                 if (di->cache.flags & BQ27500_FLAG_FC)
                         status = POWER_SUPPLY_STATUS_FULL;
                 else if (di->cache.flags & BQ27500_FLAG_DSC)
@@ -425,7 +537,7 @@ static int bq27x00_battery_capacity_level(struct bq27x00_device_info *di,
 {
         int level;
 
-        if (di->chip == BQ27500) {
+        if (bq27xxx_is_chip_version_higher(di)) {
                 if (di->cache.flags & BQ27500_FLAG_FC)
                         level = POWER_SUPPLY_CAPACITY_LEVEL_FULL;
                 else if (di->cache.flags & BQ27500_FLAG_SOC1)
@@ -550,6 +662,12 @@ static int bq27x00_battery_get_property(struct power_supply *psy,
         case POWER_SUPPLY_PROP_ENERGY_NOW:
                 ret = bq27x00_simple_value(di->cache.energy, val);
                 break;
+        case POWER_SUPPLY_PROP_POWER_AVG:
+                ret = bq27x00_simple_value(di->cache.power_avg, val);
+                break;
+        case POWER_SUPPLY_PROP_HEALTH:
+                ret = bq27x00_simple_value(di->cache.health, val);
+                break;
         default:
                 return -EINVAL;
         }
@@ -570,8 +688,14 @@ static int bq27x00_powersupply_init(struct bq27x00_device_info *di)
         int ret;
 
         di->bat.type = POWER_SUPPLY_TYPE_BATTERY;
-        di->bat.properties = bq27x00_battery_props;
-        di->bat.num_properties = ARRAY_SIZE(bq27x00_battery_props);
+        di->chip = BQ27425;
+        if (di->chip == BQ27425) {
+                di->bat.properties = bq27425_battery_props;
+                di->bat.num_properties = ARRAY_SIZE(bq27425_battery_props);
+        } else {
+                di->bat.properties = bq27x00_battery_props;
+                di->bat.num_properties = ARRAY_SIZE(bq27x00_battery_props);
+        }
         di->bat.get_property = bq27x00_battery_get_property;
         di->bat.external_power_changed = bq27x00_external_power_changed;
 
@@ -729,6 +853,7 @@ static int bq27x00_battery_remove(struct i2c_client *client)
 static const struct i2c_device_id bq27x00_id[] = {
         { "bq27200", BQ27000 }, /* bq27200 is same as bq27000, but with i2c */
         { "bq27500", BQ27500 },
+        { "bq27425", BQ27425 },
         {},
 };
 MODULE_DEVICE_TABLE(i2c, bq27x00_id);
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 86935ec18954..526e5c931294 100644
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -271,16 +271,13 @@ static int try_charger_enable(struct charger_manager *cm, bool enable)
         if (enable) {
                 if (cm->emergency_stop)
                         return -EAGAIN;
-                err = regulator_bulk_enable(desc->num_charger_regulators,
-                                        desc->charger_regulators);
+                for (i = 0 ; i < desc->num_charger_regulators ; i++)
+                        regulator_enable(desc->charger_regulators[i].consumer);
         } else {
                 /*
                  * Abnormal battery state - Stop charging forcibly,
                  * even if charger was enabled at the other places
                  */
-                err = regulator_bulk_disable(desc->num_charger_regulators,
-                                        desc->charger_regulators);
-
                 for (i = 0; i < desc->num_charger_regulators; i++) {
                         if (regulator_is_enabled(
                                     desc->charger_regulators[i].consumer)) {
@@ -288,7 +285,7 @@ static int try_charger_enable(struct charger_manager *cm, bool enable)
                                         desc->charger_regulators[i].consumer);
                                 dev_warn(cm->dev,
                                         "Disable regulator(%s) forcibly.\n",
-                                        desc->charger_regulators[i].supply);
+                                        desc->charger_regulators[i].regulator_name);
                         }
                 }
         }
@@ -994,11 +991,92 @@ int setup_charger_manager(struct charger_global_desc *gd)
 }
 EXPORT_SYMBOL_GPL(setup_charger_manager);
 
+/**
+ * charger_extcon_work - enable/diable charger according to the state
+ *                      of charger cable
+ *
+ * @work: work_struct of the function charger_extcon_work.
+ */
+static void charger_extcon_work(struct work_struct *work)
+{
+        struct charger_cable *cable =
+                        container_of(work, struct charger_cable, wq);
+        int ret;
+
+        if (cable->attached && cable->min_uA != 0 && cable->max_uA != 0) {
+                ret = regulator_set_current_limit(cable->charger->consumer,
+                                        cable->min_uA, cable->max_uA);
+                if (ret < 0) {
+                        pr_err("Cannot set current limit of %s (%s)\n",
+                                cable->charger->regulator_name, cable->name);
+                        return;
+                }
+
+                pr_info("Set current limit of %s : %duA ~ %duA\n",
+                                        cable->charger->regulator_name,
+                                        cable->min_uA, cable->max_uA);
+        }
+
+        try_charger_enable(cable->cm, cable->attached);
+}
+
+/**
+ * charger_extcon_notifier - receive the state of charger cable
+ *                      when registered cable is attached or detached.
+ *
+ * @self: the notifier block of the charger_extcon_notifier.
+ * @event: the cable state.
+ * @ptr: the data pointer of notifier block.
+ */
+static int charger_extcon_notifier(struct notifier_block *self,
+                        unsigned long event, void *ptr)
+{
+        struct charger_cable *cable =
+                container_of(self, struct charger_cable, nb);
+
+        cable->attached = event;
+        schedule_work(&cable->wq);
+
+        return NOTIFY_DONE;
+}
+
+/**
+ * charger_extcon_init - register external connector to use it
+ *                      as the charger cable
+ *
+ * @cm: the Charger Manager representing the battery.
+ * @cable: the Charger cable representing the external connector.
+ */
+static int charger_extcon_init(struct charger_manager *cm,
+                struct charger_cable *cable)
+{
+        int ret = 0;
+
+        /*
+         * Charger manager use Extcon framework to identify
+         * the charger cable among various external connector
+         * cable (e.g., TA, USB, MHL, Dock).
+         */
+        INIT_WORK(&cable->wq, charger_extcon_work);
+        cable->nb.notifier_call = charger_extcon_notifier;
+        ret = extcon_register_interest(&cable->extcon_dev,
+                        cable->extcon_name, cable->name, &cable->nb);
+        if (ret < 0) {
+                pr_info("Cannot register extcon_dev for %s(cable: %s).\n",
+                                cable->extcon_name,
+                                cable->name);
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+
 static int charger_manager_probe(struct platform_device *pdev)
 {
         struct charger_desc *desc = dev_get_platdata(&pdev->dev);
         struct charger_manager *cm;
         int ret = 0, i = 0;
+        int j = 0;
         union power_supply_propval val;
 
         if (g_desc && !rtc_dev && g_desc->rtc_name) {
@@ -1167,11 +1245,31 @@ static int charger_manager_probe(struct platform_device *pdev)
                 goto err_register;
         }
 
-        ret = regulator_bulk_get(&pdev->dev, desc->num_charger_regulators,
-                                 desc->charger_regulators);
-        if (ret) {
-                dev_err(&pdev->dev, "Cannot get charger regulators.\n");
-                goto err_bulk_get;
+        for (i = 0 ; i < desc->num_charger_regulators ; i++) {
+                struct charger_regulator *charger
+                                        = &desc->charger_regulators[i];
+
+                charger->consumer = regulator_get(&pdev->dev,
+                                        charger->regulator_name);
+                if (charger->consumer == NULL) {
+                        dev_err(&pdev->dev, "Cannot find charger(%s)n",
+                                                charger->regulator_name);
+                        ret = -EINVAL;
+                        goto err_chg_get;
+                }
+
+                for (j = 0 ; j < charger->num_cables ; j++) {
+                        struct charger_cable *cable = &charger->cables[j];
+
+                        ret = charger_extcon_init(cm, cable);
+                        if (ret < 0) {
+                                dev_err(&pdev->dev, "Cannot find charger(%s)n",
+                                                charger->regulator_name);
+                                goto err_extcon;
+                        }
+                        cable->charger = charger;
+                        cable->cm = cm;
+                }
         }
 
         ret = try_charger_enable(cm, true);
@@ -1197,9 +1295,19 @@ static int charger_manager_probe(struct platform_device *pdev)
         return 0;
 
 err_chg_enable:
-        regulator_bulk_free(desc->num_charger_regulators,
-                            desc->charger_regulators);
-err_bulk_get:
+err_extcon:
+        for (i = 0 ; i < desc->num_charger_regulators ; i++) {
+                struct charger_regulator *charger
+                                = &desc->charger_regulators[i];
+                for (j = 0 ; j < charger->num_cables ; j++) {
+                        struct charger_cable *cable = &charger->cables[j];
+                        extcon_unregister_interest(&cable->extcon_dev);
+                }
+        }
+err_chg_get:
+        for (i = 0 ; i < desc->num_charger_regulators ; i++)
+                regulator_put(desc->charger_regulators[i].consumer);
+
         power_supply_unregister(&cm->charger_psy);
 err_register:
         kfree(cm->charger_psy.properties);
@@ -1218,6 +1326,8 @@ static int __devexit charger_manager_remove(struct platform_device *pdev)
 {
         struct charger_manager *cm = platform_get_drvdata(pdev);
         struct charger_desc *desc = cm->desc;
+        int i = 0;
+        int j = 0;
 
         /* Remove from the list */
         mutex_lock(&cm_list_mtx);
@@ -1229,8 +1339,18 @@ static int __devexit charger_manager_remove(struct platform_device *pdev)
         if (delayed_work_pending(&cm_monitor_work))
                 cancel_delayed_work_sync(&cm_monitor_work);
 
-        regulator_bulk_free(desc->num_charger_regulators,
-                            desc->charger_regulators);
+        for (i = 0 ; i < desc->num_charger_regulators ; i++) {
+                struct charger_regulator *charger
+                                = &desc->charger_regulators[i];
+                for (j = 0 ; j < charger->num_cables ; j++) {
+                        struct charger_cable *cable = &charger->cables[j];
+                        extcon_unregister_interest(&cable->extcon_dev);
+                }
+        }
+
+        for (i = 0 ; i < desc->num_charger_regulators ; i++)
+                regulator_put(desc->charger_regulators[i].consumer);
+
         power_supply_unregister(&cm->charger_psy);
 
         try_charger_enable(cm, false);
diff --git a/drivers/power/ds2781_battery.c b/drivers/power/ds2781_battery.c
index 5f92a4bb33f9..7a1ff4e4cf9a 100644
--- a/drivers/power/ds2781_battery.c
+++ b/drivers/power/ds2781_battery.c
@@ -64,7 +64,7 @@ static inline int ds2781_battery_io(struct ds2781_device_info *dev_info,
         return w1_ds2781_io(dev_info->w1_dev, buf, addr, count, io);
 }
 
-int w1_ds2781_read(struct ds2781_device_info *dev_info, char *buf,
+static int w1_ds2781_read(struct ds2781_device_info *dev_info, char *buf,
                 int addr, size_t count)
 {
         return ds2781_battery_io(dev_info, buf, addr, count, 0);
diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c
index 8672c9177dd7..cb2aa3195687 100644
--- a/drivers/power/gpio-charger.c
+++ b/drivers/power/gpio-charger.c
@@ -54,7 +54,7 @@ static int gpio_charger_get_property(struct power_supply *psy,
 
         switch (psp) {
         case POWER_SUPPLY_PROP_ONLINE:
-                val->intval = gpio_get_value(pdata->gpio);
+                val->intval = gpio_get_value_cansleep(pdata->gpio);
                 val->intval ^= pdata->gpio_active_low;
                 break;
         default:
diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c
index d8b75780bfef..6a364f4798f7 100644
--- a/drivers/power/lp8727_charger.c
+++ b/drivers/power/lp8727_charger.c
@@ -15,7 +15,7 @@
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
 #include <linux/power_supply.h>
-#include <linux/lp8727.h>
+#include <linux/platform_data/lp8727.h>
 
 #define DEBOUNCE_MSEC   270
 
diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c
index 140788b309f8..74abc6c755b4 100644
--- a/drivers/power/max17042_battery.c
+++ b/drivers/power/max17042_battery.c
@@ -113,6 +113,7 @@ static enum power_supply_property max17042_battery_props[] = {
         POWER_SUPPLY_PROP_VOLTAGE_OCV,
         POWER_SUPPLY_PROP_CAPACITY,
         POWER_SUPPLY_PROP_CHARGE_FULL,
+        POWER_SUPPLY_PROP_CHARGE_COUNTER,
         POWER_SUPPLY_PROP_TEMP,
         POWER_SUPPLY_PROP_CURRENT_NOW,
         POWER_SUPPLY_PROP_CURRENT_AVG,
@@ -201,6 +202,13 @@ static int max17042_get_property(struct power_supply *psy,
 
                 val->intval = ret * 1000 / 2;
                 break;
+        case POWER_SUPPLY_PROP_CHARGE_COUNTER:
+                ret = max17042_read_reg(chip->client, MAX17042_QH);
+                if (ret < 0)
+                        return ret;
+
+                val->intval = ret * 1000 / 2;
+                break;
         case POWER_SUPPLY_PROP_TEMP:
                 ret = max17042_read_reg(chip->client, MAX17042_TEMP);
                 if (ret < 0)
diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c
index 7385092f9bc8..55b10b813353 100644
--- a/drivers/power/olpc_battery.c
+++ b/drivers/power/olpc_battery.c
@@ -231,11 +231,9 @@ static int olpc_bat_get_charge_full_design(union power_supply_propval *val)
 
         case POWER_SUPPLY_TECHNOLOGY_LiFe:
                 switch (mfr) {
-                case 1: /* Gold Peak */
-                        val->intval = 2800000;
-                        break;
+                case 1: /* Gold Peak, fall through */
                 case 2: /* BYD */
-                        val->intval = 3100000;
+                        val->intval = 2800000;
                         break;
                 default:
                         return -EIO;
@@ -267,6 +265,55 @@ static int olpc_bat_get_charge_now(union power_supply_propval *val)
         return 0;
 }
 
+static int olpc_bat_get_voltage_max_design(union power_supply_propval *val)
+{
+        uint8_t ec_byte;
+        union power_supply_propval tech;
+        int mfr;
+        int ret;
+
+        ret = olpc_bat_get_tech(&tech);
+        if (ret)
+                return ret;
+
+        ec_byte = BAT_ADDR_MFR_TYPE;
+        ret = olpc_ec_cmd(EC_BAT_EEPROM, &ec_byte, 1, &ec_byte, 1);
+        if (ret)
+                return ret;
+
+        mfr = ec_byte >> 4;
+
+        switch (tech.intval) {
+        case POWER_SUPPLY_TECHNOLOGY_NiMH:
+                switch (mfr) {
+                case 1: /* Gold Peak */
+                        val->intval = 6000000;
+                        break;
+                default:
+                        return -EIO;
+                }
+                break;
+
+        case POWER_SUPPLY_TECHNOLOGY_LiFe:
+                switch (mfr) {
+                case 1: /* Gold Peak */
+                        val->intval = 6400000;
+                        break;
+                case 2: /* BYD */
+                        val->intval = 6500000;
+                        break;
+                default:
+                        return -EIO;
+                }
+                break;
+
+        default:
+                return -EIO;
+        }
+
+        return ret;
+}
+
 /*********************************************************************
  *              Battery properties
  *********************************************************************/
@@ -401,6 +448,11 @@ static int olpc_bat_get_property(struct power_supply *psy,
                 sprintf(bat_serial, "%016llx", (long long)be64_to_cpu(ser_buf));
                 val->strval = bat_serial;
                 break;
+        case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
+                ret = olpc_bat_get_voltage_max_design(val);
+                if (ret)
+                        return ret;
+                break;
         default:
                 ret = -EINVAL;
                 break;
@@ -428,6 +480,7 @@ static enum power_supply_property olpc_xo1_bat_props[] = {
         POWER_SUPPLY_PROP_MANUFACTURER,
         POWER_SUPPLY_PROP_SERIAL_NUMBER,
         POWER_SUPPLY_PROP_CHARGE_COUNTER,
+        POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,
 };
 
 /* XO-1.5 does not have ambient temperature property */
@@ -449,6 +502,7 @@ static enum power_supply_property olpc_xo15_bat_props[] = {
         POWER_SUPPLY_PROP_MANUFACTURER,
         POWER_SUPPLY_PROP_SERIAL_NUMBER,
         POWER_SUPPLY_PROP_CHARGE_COUNTER,
+        POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,
 };
 
 /* EEPROM reading goes completely around the power_supply API, sadly */
diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index 8dbcd53c5e67..7312f2651647 100644
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -24,11 +24,7 @@
 
 static inline unsigned int get_irq_flags(struct resource *res)
 {
-        unsigned int flags = IRQF_SAMPLE_RANDOM | IRQF_SHARED;
-
-        flags |= res->flags & IRQF_TRIGGER_MASK;
-
-        return flags;
+        return IRQF_SHARED | (res->flags & IRQF_TRIGGER_MASK);
 }
 
 static struct device *dev;
@@ -134,13 +130,13 @@ static void update_charger(void)
                         regulator_set_current_limit(ac_draw, max_uA, max_uA);
                         if (!regulator_enabled) {
                                 dev_dbg(dev, "charger on (AC)\n");
-                                regulator_enable(ac_draw);
+                                WARN_ON(regulator_enable(ac_draw));
                                 regulator_enabled = 1;
                         }
                 } else {
                         if (regulator_enabled) {
                                 dev_dbg(dev, "charger off\n");
-                                regulator_disable(ac_draw);
+                                WARN_ON(regulator_disable(ac_draw));
                                 regulator_enabled = 0;
                         }
                 }
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 6ad612726785..08cc8a3c15af 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -17,6 +17,7 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/power_supply.h>
+#include <linux/thermal.h>
 #include "power_supply.h"
 
 /* exported for the APM Power driver, APM emulation */
@@ -169,6 +170,63 @@ static void power_supply_dev_release(struct device *dev)
         kfree(dev);
 }
 
+#ifdef CONFIG_THERMAL
+static int power_supply_read_temp(struct thermal_zone_device *tzd,
+                unsigned long *temp)
+{
+        struct power_supply *psy;
+        union power_supply_propval val;
+        int ret;
+
+        WARN_ON(tzd == NULL);
+        psy = tzd->devdata;
+        ret = psy->get_property(psy, POWER_SUPPLY_PROP_TEMP, &val);
+
+        /* Convert tenths of degree Celsius to milli degree Celsius. */
+        if (!ret)
+                *temp = val.intval * 100;
+
+        return ret;
+}
+
+static struct thermal_zone_device_ops psy_tzd_ops = {
+        .get_temp = power_supply_read_temp,
+};
+
+static int psy_register_thermal(struct power_supply *psy)
+{
+        int i;
+
+        /* Register battery zone device psy reports temperature */
+        for (i = 0; i < psy->num_properties; i++) {
+                if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) {
+                        psy->tzd = thermal_zone_device_register(psy->name, 0, 0,
+                                        psy, &psy_tzd_ops, 0, 0, 0, 0);
+                        if (IS_ERR(psy->tzd))
+                                return PTR_ERR(psy->tzd);
+                        break;
+                }
+        }
+        return 0;
+}
+
+static void psy_unregister_thermal(struct power_supply *psy)
+{
+        if (IS_ERR_OR_NULL(psy->tzd))
+                return;
+        thermal_zone_device_unregister(psy->tzd);
+}
+#else
+static int psy_register_thermal(struct power_supply *psy)
+{
+        return 0;
+}
+
+static void psy_unregister_thermal(struct power_supply *psy)
+{
+}
+#endif
+
 int power_supply_register(struct device *parent, struct power_supply *psy)
 {
         struct device *dev;
@@ -197,6 +255,10 @@ int power_supply_register(struct device *parent, struct power_supply *psy)
         if (rc)
                 goto device_add_failed;
 
+        rc = psy_register_thermal(psy);
+        if (rc)
+                goto register_thermal_failed;
+
         rc = power_supply_create_triggers(psy);
         if (rc)
                 goto create_triggers_failed;
@@ -206,6 +268,8 @@ int power_supply_register(struct device *parent, struct power_supply *psy)
         goto success;
 
 create_triggers_failed:
+        psy_unregister_thermal(psy);
+register_thermal_failed:
         device_del(dev);
 kobject_set_name_failed:
 device_add_failed:
@@ -220,6 +284,7 @@ void power_supply_unregister(struct power_supply *psy)
         cancel_work_sync(&psy->changed_work);
         sysfs_remove_link(&psy->dev->kobj, "powers");
         power_supply_remove_triggers(psy);
+        psy_unregister_thermal(psy);
         device_unregister(psy->dev);
 }
 EXPORT_SYMBOL_GPL(power_supply_unregister);
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 4150747f9186..1d96614a17a4 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -159,6 +159,8 @@ static struct device_attribute power_supply_attrs[] = {
         POWER_SUPPLY_ATTR(charge_now),
         POWER_SUPPLY_ATTR(charge_avg),
         POWER_SUPPLY_ATTR(charge_counter),
+        POWER_SUPPLY_ATTR(constant_charge_current),
+        POWER_SUPPLY_ATTR(constant_charge_voltage),
         POWER_SUPPLY_ATTR(energy_full_design),
         POWER_SUPPLY_ATTR(energy_empty_design),
         POWER_SUPPLY_ATTR(energy_full),
@@ -166,9 +168,15 @@ static struct device_attribute power_supply_attrs[] = {
         POWER_SUPPLY_ATTR(energy_now),
         POWER_SUPPLY_ATTR(energy_avg),
         POWER_SUPPLY_ATTR(capacity),
+        POWER_SUPPLY_ATTR(capacity_alert_min),
+        POWER_SUPPLY_ATTR(capacity_alert_max),
         POWER_SUPPLY_ATTR(capacity_level),
         POWER_SUPPLY_ATTR(temp),
+        POWER_SUPPLY_ATTR(temp_alert_min),
+        POWER_SUPPLY_ATTR(temp_alert_max),
         POWER_SUPPLY_ATTR(temp_ambient),
+        POWER_SUPPLY_ATTR(temp_ambient_alert_min),
+        POWER_SUPPLY_ATTR(temp_ambient_alert_max),
         POWER_SUPPLY_ATTR(time_to_empty_now),
         POWER_SUPPLY_ATTR(time_to_empty_avg),
         POWER_SUPPLY_ATTR(time_to_full_now),
diff --git a/drivers/power/sbs-battery.c b/drivers/power/sbs-battery.c
index a5b6849d4123..a65e8f54157e 100644
--- a/drivers/power/sbs-battery.c
+++ b/drivers/power/sbs-battery.c
@@ -469,7 +469,7 @@ static int sbs_get_property(struct power_supply *psy,
 
         case POWER_SUPPLY_PROP_TECHNOLOGY:
                 val->intval = POWER_SUPPLY_TECHNOLOGY_LION;
-                break;
+                goto done; /* don't trigger power_supply_changed()! */
 
         case POWER_SUPPLY_PROP_ENERGY_NOW:
         case POWER_SUPPLY_PROP_ENERGY_FULL:
diff --git a/drivers/power/smb347-charger.c b/drivers/power/smb347-charger.c
index f8eedd8a676f..332dd0110bda 100644
--- a/drivers/power/smb347-charger.c
+++ b/drivers/power/smb347-charger.c
@@ -196,6 +196,14 @@ static const unsigned int ccc_tbl[] = {
         1200000,
 };
 
+/* Convert register value to current using lookup table */
+static int hw_to_current(const unsigned int *tbl, size_t size, unsigned int val)
+{
+        if (val >= size)
+                return -EINVAL;
+        return tbl[val];
+}
+
 /* Convert current to register value using lookup table */
 static int current_to_hw(const unsigned int *tbl, size_t size, unsigned int val)
 {
@@ -841,22 +849,101 @@ fail:
         return ret;
 }
 
+/*
+ * Returns the constant charge current programmed
+ * into the charger in uA.
+ */
+static int get_const_charge_current(struct smb347_charger *smb)
+{
+        int ret, intval;
+        unsigned int v;
+
+        if (!smb347_is_ps_online(smb))
+                return -ENODATA;
+
+        ret = regmap_read(smb->regmap, STAT_B, &v);
+        if (ret < 0)
+                return ret;
+
+        /*
+         * The current value is composition of FCC and PCC values
+         * and we can detect which table to use from bit 5.
+         */
+        if (v & 0x20) {
+                intval = hw_to_current(fcc_tbl, ARRAY_SIZE(fcc_tbl), v & 7);
+        } else {
+                v >>= 3;
+                intval = hw_to_current(pcc_tbl, ARRAY_SIZE(pcc_tbl), v & 7);
+        }
+
+        return intval;
+}
+
+/*
+ * Returns the constant charge voltage programmed
+ * into the charger in uV.
+ */
+static int get_const_charge_voltage(struct smb347_charger *smb)
+{
+        int ret, intval;
+        unsigned int v;
+
+        if (!smb347_is_ps_online(smb))
+                return -ENODATA;
+
+        ret = regmap_read(smb->regmap, STAT_A, &v);
+        if (ret < 0)
+                return ret;
+
+        v &= STAT_A_FLOAT_VOLTAGE_MASK;
+        if (v > 0x3d)
+                v = 0x3d;
+
+        intval = 3500000 + v * 20000;
+
+        return intval;
+}
+
 static int smb347_mains_get_property(struct power_supply *psy,
                                      enum power_supply_property prop,
                                      union power_supply_propval *val)
 {
         struct smb347_charger *smb =
                 container_of(psy, struct smb347_charger, mains);
+        int ret;
 
-        if (prop == POWER_SUPPLY_PROP_ONLINE) {
+        switch (prop) {
+        case POWER_SUPPLY_PROP_ONLINE:
                 val->intval = smb->mains_online;
-                return 0;
+                break;
+
+        case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:
+                ret = get_const_charge_voltage(smb);
+                if (ret < 0)
+                        return ret;
+                else
+                        val->intval = ret;
+                break;
+
+        case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
+                ret = get_const_charge_current(smb);
+                if (ret < 0)
+                        return ret;
+                else
+                        val->intval = ret;
+                break;
+
+        default:
+                return -EINVAL;
         }
-        return -EINVAL;
+
+        return 0;
 }
 
 static enum power_supply_property smb347_mains_properties[] = {
         POWER_SUPPLY_PROP_ONLINE,
+        POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT,
+        POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,
 };
 
 static int smb347_usb_get_property(struct power_supply *psy,
@@ -865,16 +952,40 @@ static int smb347_usb_get_property(struct power_supply *psy,
 {
         struct smb347_charger *smb =
                 container_of(psy, struct smb347_charger, usb);
+        int ret;
 
-        if (prop == POWER_SUPPLY_PROP_ONLINE) {
+        switch (prop) {
+        case POWER_SUPPLY_PROP_ONLINE:
                 val->intval = smb->usb_online;
-                return 0;
+                break;
+
+        case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:
+                ret = get_const_charge_voltage(smb);
+                if (ret < 0)
+                        return ret;
+                else
+                        val->intval = ret;
+                break;
+
+        case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
+                ret = get_const_charge_current(smb);
+                if (ret < 0)
+                        return ret;
+                else
+                        val->intval = ret;
+                break;
+
+        default:
+                return -EINVAL;
         }
-        return -EINVAL;
+
+        return 0;
 }
 
 static enum power_supply_property smb347_usb_properties[] = {
         POWER_SUPPLY_PROP_ONLINE,
+        POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT,
+        POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,
 };
 
 static int smb347_battery_get_property(struct power_supply *psy,
diff --git a/drivers/power/test_power.c b/drivers/power/test_power.c
index b527c93bf2f3..b99a452a4fda 100644
--- a/drivers/power/test_power.c
+++ b/drivers/power/test_power.c
@@ -22,11 +22,13 @@
 #include <linux/vermagic.h>
 
 static int ac_online                    = 1;
+static int usb_online                   = 1;
 static int battery_status               = POWER_SUPPLY_STATUS_DISCHARGING;
 static int battery_health               = POWER_SUPPLY_HEALTH_GOOD;
 static int battery_present              = 1; /* true */
 static int battery_technology           = POWER_SUPPLY_TECHNOLOGY_LION;
 static int battery_capacity             = 50;
+static int battery_voltage              = 3300;
 
 static int test_power_get_ac_property(struct power_supply *psy,
                                       enum power_supply_property psp,
@@ -42,6 +44,20 @@ static int test_power_get_ac_property(struct power_supply *psy,
         return 0;
 }
 
+static int test_power_get_usb_property(struct power_supply *psy,
+                                      enum power_supply_property psp,
+                                      union power_supply_propval *val)
+{
+        switch (psp) {
+        case POWER_SUPPLY_PROP_ONLINE:
+                val->intval = usb_online;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
 static int test_power_get_battery_property(struct power_supply *psy,
                                            enum power_supply_property psp,
                                            union power_supply_propval *val)
@@ -86,6 +102,12 @@ static int test_power_get_battery_property(struct power_supply *psy,
         case POWER_SUPPLY_PROP_TIME_TO_FULL_NOW:
                 val->intval = 3600;
                 break;
+        case POWER_SUPPLY_PROP_TEMP:
+                val->intval = 26;
+                break;
+        case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+                val->intval = battery_voltage;
+                break;
         default:
                 pr_info("%s: some properties deliberately report errors.\n",
                         __func__);
@@ -114,6 +136,8 @@ static enum power_supply_property test_power_battery_props[] = {
         POWER_SUPPLY_PROP_MODEL_NAME,
         POWER_SUPPLY_PROP_MANUFACTURER,
         POWER_SUPPLY_PROP_SERIAL_NUMBER,
+        POWER_SUPPLY_PROP_TEMP,
+        POWER_SUPPLY_PROP_VOLTAGE_NOW,
 };
 
 static char *test_power_ac_supplied_to[] = {
@@ -135,6 +159,14 @@ static struct power_supply test_power_supplies[] = {
                 .properties = test_power_battery_props,
                 .num_properties = ARRAY_SIZE(test_power_battery_props),
                 .get_property = test_power_get_battery_property,
+        }, {
+                .name = "test_usb",
+                .type = POWER_SUPPLY_TYPE_USB,
+                .supplied_to = test_power_ac_supplied_to,
+                .num_supplicants = ARRAY_SIZE(test_power_ac_supplied_to),
+                .properties = test_power_ac_props,
+                .num_properties = ARRAY_SIZE(test_power_ac_props),
+                .get_property = test_power_get_usb_property,
         },
 };
 
@@ -167,6 +199,7 @@ static void __exit test_power_exit(void)
 
         /* Let's see how we handle changes... */
         ac_online = 0;
+        usb_online = 0;
         battery_status = POWER_SUPPLY_STATUS_DISCHARGING;
         for (i = 0; i < ARRAY_SIZE(test_power_supplies); i++)
                 power_supply_changed(&test_power_supplies[i]);
@@ -275,6 +308,19 @@ static int param_get_ac_online(char *buffer, const struct kernel_param *kp)
         return strlen(buffer);
 }
 
+static int param_set_usb_online(const char *key, const struct kernel_param *kp)
+{
+        usb_online = map_get_value(map_ac_online, key, usb_online);
+        power_supply_changed(&test_power_supplies[2]);
+        return 0;
+}
+
+static int param_get_usb_online(char *buffer, const struct kernel_param *kp)
+{
+        strcpy(buffer, map_get_key(map_ac_online, usb_online, "unknown"));
+        return strlen(buffer);
+}
+
 static int param_set_battery_status(const char *key,
                                         const struct kernel_param *kp)
 {
@@ -350,13 +396,31 @@ static int param_set_battery_capacity(const char *key,
 
 #define param_get_battery_capacity param_get_int
 
+static int param_set_battery_voltage(const char *key,
+                                        const struct kernel_param *kp)
+{
+        int tmp;
+
+        if (1 != sscanf(key, "%d", &tmp))
+                return -EINVAL;
+
+        battery_voltage = tmp;
+        power_supply_changed(&test_power_supplies[1]);
+        return 0;
+}
 
+#define param_get_battery_voltage param_get_int
 
 static struct kernel_param_ops param_ops_ac_online = {
         .set = param_set_ac_online,
         .get = param_get_ac_online,
 };
 
+static struct kernel_param_ops param_ops_usb_online = {
+        .set = param_set_usb_online,
+        .get = param_get_usb_online,
+};
+
 static struct kernel_param_ops param_ops_battery_status = {
         .set = param_set_battery_status,
         .get = param_get_battery_status,
@@ -382,18 +446,27 @@ static struct kernel_param_ops param_ops_battery_capacity = {
         .get = param_get_battery_capacity,
 };
 
+static struct kernel_param_ops param_ops_battery_voltage = {
+        .set = param_set_battery_voltage,
+        .get = param_get_battery_voltage,
+};
 
 #define param_check_ac_online(name, p) __param_check(name, p, void);
+#define param_check_usb_online(name, p) __param_check(name, p, void);
 #define param_check_battery_status(name, p) __param_check(name, p, void);
 #define param_check_battery_present(name, p) __param_check(name, p, void);
 #define param_check_battery_technology(name, p) __param_check(name, p, void);
 #define param_check_battery_health(name, p) __param_check(name, p, void);
 #define param_check_battery_capacity(name, p) __param_check(name, p, void);
+#define param_check_battery_voltage(name, p) __param_check(name, p, void);
 
 
 module_param(ac_online, ac_online, 0644);
 MODULE_PARM_DESC(ac_online, "AC charging state <on|off>");
 
+module_param(usb_online, usb_online, 0644);
+MODULE_PARM_DESC(usb_online, "USB charging state <on|off>");
+
 module_param(battery_status, battery_status, 0644);
 MODULE_PARM_DESC(battery_status,
         "battery status <charging|discharging|not-charging|full>");
@@ -413,6 +486,8 @@ MODULE_PARM_DESC(battery_health,
 module_param(battery_capacity, battery_capacity, 0644);
 MODULE_PARM_DESC(battery_capacity, "battery capacity (percentage)");
 
+module_param(battery_voltage, battery_voltage, 0644);
+MODULE_PARM_DESC(battery_voltage, "battery voltage (millivolts)");
 
 MODULE_DESCRIPTION("Power supply driver for testing");
 MODULE_AUTHOR("Anton Vorontsov <cbouatmailru@gmail.com>");
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
index 7cacbaa68efe..15f4d5d8611b 100644
--- a/drivers/power/twl4030_charger.c
+++ b/drivers/power/twl4030_charger.c
@@ -22,6 +22,7 @@
 #include <linux/power_supply.h>
 #include <linux/notifier.h>
 #include <linux/usb/otg.h>
+#include <linux/regulator/machine.h>
 
 #define TWL4030_BCIMSTATEC      0x02
 #define TWL4030_BCIICHG         0x08
@@ -29,6 +30,7 @@
 #define TWL4030_BCIVBUS         0x0c
 #define TWL4030_BCIMFSTS4       0x10
 #define TWL4030_BCICTL1         0x23
+#define TWL4030_BB_CFG          0x12
 
 #define TWL4030_BCIAUTOWEN      BIT(5)
 #define TWL4030_CONFIG_DONE     BIT(4)
@@ -38,6 +40,17 @@
 #define TWL4030_USBFASTMCHG     BIT(2)
 #define TWL4030_STS_VBUS        BIT(7)
 #define TWL4030_STS_USB_ID      BIT(2)
+#define TWL4030_BBCHEN          BIT(4)
+#define TWL4030_BBSEL_MASK      0b1100
+#define TWL4030_BBSEL_2V5       0b0000
+#define TWL4030_BBSEL_3V0       0b0100
+#define TWL4030_BBSEL_3V1       0b1000
+#define TWL4030_BBSEL_3V2       0b1100
+#define TWL4030_BBISEL_MASK     0b11
+#define TWL4030_BBISEL_25uA     0b00
+#define TWL4030_BBISEL_150uA    0b01
+#define TWL4030_BBISEL_500uA    0b10
+#define TWL4030_BBISEL_1000uA   0b11
 
 /* BCI interrupts */
 #define TWL4030_WOVF            BIT(0) /* Watchdog overflow */
@@ -75,6 +88,8 @@ struct twl4030_bci {
         struct work_struct      work;
         int                     irq_chg;
         int                     irq_bci;
+        struct regulator        *usb_reg;
+        int                     usb_enabled;
 
         unsigned long           event;
 };
@@ -104,7 +119,7 @@ static int twl4030_bci_read(u8 reg, u8 *val)
 
 static int twl4030_clear_set_boot_bci(u8 clear, u8 set)
 {
-        return twl4030_clear_set(TWL4030_MODULE_PM_MASTER, 0,
+        return twl4030_clear_set(TWL4030_MODULE_PM_MASTER, clear,
                         TWL4030_CONFIG_DONE | TWL4030_BCIAUTOWEN | set,
                         TWL4030_PM_MASTER_BOOT_BCI);
 }
@@ -152,14 +167,14 @@ static int twl4030_bci_have_vbus(struct twl4030_bci *bci)
 }
 
 /*
- * Enable/Disable USB Charge funtionality.
+ * Enable/Disable USB Charge functionality.
  */
 static int twl4030_charger_enable_usb(struct twl4030_bci *bci, bool enable)
 {
         int ret;
 
         if (enable) {
-                /* Check for USB charger conneted */
+                /* Check for USB charger connected */
                 if (!twl4030_bci_have_vbus(bci))
                         return -ENODEV;
 
@@ -172,6 +187,12 @@ static int twl4030_charger_enable_usb(struct twl4030_bci *bci, bool enable)
                         return -EACCES;
                 }
 
+                /* Need to keep regulator on */
+                if (!bci->usb_enabled) {
+                        regulator_enable(bci->usb_reg);
+                        bci->usb_enabled = 1;
+                }
+
                 /* forcing the field BCIAUTOUSB (BOOT_BCI[1]) to 1 */
                 ret = twl4030_clear_set_boot_bci(0, TWL4030_BCIAUTOUSB);
                 if (ret < 0)
@@ -182,6 +203,10 @@ static int twl4030_charger_enable_usb(struct twl4030_bci *bci, bool enable)
                         TWL4030_USBFASTMCHG, TWL4030_BCIMFSTS4);
         } else {
                 ret = twl4030_clear_set_boot_bci(TWL4030_BCIAUTOUSB, 0);
+                if (bci->usb_enabled) {
+                        regulator_disable(bci->usb_reg);
+                        bci->usb_enabled = 0;
+                }
         }
 
         return ret;
@@ -203,6 +228,49 @@ static int twl4030_charger_enable_ac(bool enable)
 }
 
 /*
+ * Enable/Disable charging of Backup Battery.
+ */
+static int twl4030_charger_enable_backup(int uvolt, int uamp)
+{
+        int ret;
+        u8 flags;
+
+        if (uvolt < 2500000 ||
+            uamp < 25) {
+                /* disable charging of backup battery */
+                ret = twl4030_clear_set(TWL4030_MODULE_PM_RECEIVER,
+                                        TWL4030_BBCHEN, 0, TWL4030_BB_CFG);
+                return ret;
+        }
+
+        flags = TWL4030_BBCHEN;
+        if (uvolt >= 3200000)
+                flags |= TWL4030_BBSEL_3V2;
+        else if (uvolt >= 3100000)
+                flags |= TWL4030_BBSEL_3V1;
+        else if (uvolt >= 3000000)
+                flags |= TWL4030_BBSEL_3V0;
+        else
+                flags |= TWL4030_BBSEL_2V5;
+
+        if (uamp >= 1000)
+                flags |= TWL4030_BBISEL_1000uA;
+        else if (uamp >= 500)
+                flags |= TWL4030_BBISEL_500uA;
+        else if (uamp >= 150)
+                flags |= TWL4030_BBISEL_150uA;
+        else
+                flags |= TWL4030_BBISEL_25uA;
+
+        ret = twl4030_clear_set(TWL4030_MODULE_PM_RECEIVER,
+                                TWL4030_BBSEL_MASK | TWL4030_BBISEL_MASK,
+                                flags,
+                                TWL4030_BB_CFG);
+
+        return ret;
+}
+
+/*
  * TWL4030 CHG_PRES (AC charger presence) events
  */
 static irqreturn_t twl4030_charger_interrupt(int irq, void *arg)
@@ -425,6 +493,7 @@ static enum power_supply_property twl4030_charger_props[] = {
 static int __init twl4030_bci_probe(struct platform_device *pdev)
 {
         struct twl4030_bci *bci;
+        struct twl4030_bci_platform_data *pdata = pdev->dev.platform_data;
         int ret;
         u32 reg;
 
@@ -456,6 +525,8 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
         bci->usb.num_properties = ARRAY_SIZE(twl4030_charger_props);
         bci->usb.get_property = twl4030_bci_get_property;
 
+        bci->usb_reg = regulator_get(bci->dev, "bci3v1");
+
         ret = power_supply_register(&pdev->dev, &bci->usb);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register usb: %d\n", ret);
@@ -504,6 +575,8 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
 
         twl4030_charger_enable_ac(true);
         twl4030_charger_enable_usb(bci, true);
+        twl4030_charger_enable_backup(pdata->bb_uvolt,
+                                      pdata->bb_uamp);
 
         return 0;
 
@@ -532,6 +605,7 @@ static int __exit twl4030_bci_remove(struct platform_device *pdev)
 
         twl4030_charger_enable_ac(false);
         twl4030_charger_enable_usb(bci, false);
+        twl4030_charger_enable_backup(0, 0);
 
         /* mask interrupts */
         twl_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff,
diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c
index 59c6245e0421..ea5c6f857ca5 100644
--- a/drivers/rtc/rtc-wm831x.c
+++ b/drivers/rtc/rtc-wm831x.c
@@ -24,7 +24,7 @@
 #include <linux/mfd/wm831x/core.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
-
+#include <linux/random.h>
 
 /*
  * R16416 (0x4020) - RTC Write Counter
@@ -96,6 +96,26 @@ struct wm831x_rtc {
         unsigned int alarm_enabled:1;
 };
 
+static void wm831x_rtc_add_randomness(struct wm831x *wm831x)
+{
+        int ret;
+        u16 reg;
+
+        /*
+         * The write counter contains a pseudo-random number which is
+         * regenerated every time we set the RTC so it should be a
+         * useful per-system source of entropy.
+         */
+        ret = wm831x_reg_read(wm831x, WM831X_RTC_WRITE_COUNTER);
+        if (ret >= 0) {
+                reg = ret;
+                add_device_randomness(&reg, sizeof(reg));
+        } else {
+                dev_warn(wm831x->dev, "Failed to read RTC write counter: %d\n",
+                         ret);
+        }
+}
+
 /*
  * Read current time and date in RTC
  */
@@ -431,6 +451,8 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
                         alm_irq, ret);
         }
 
+        wm831x_rtc_add_randomness(wm831x);
+
         return 0;
 
 err:
diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
index c365cdf714ea..ebe5a27c06f5 100644
--- a/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -971,20 +971,7 @@ static struct pci_driver pci_driver = {
         .remove = __devexit_p(dt3155_remove),
 };
 
-static int __init
-dt3155_init_module(void)
-{
-        return pci_register_driver(&pci_driver);
-}
-
-static void __exit
-dt3155_exit_module(void)
-{
-        pci_unregister_driver(&pci_driver);
-}
-
-module_init(dt3155_init_module);
-module_exit(dt3155_exit_module);
+module_pci_driver(pci_driver);
 
 MODULE_DESCRIPTION("video4linux pci-driver for dt3155 frame grabber");
 MODULE_AUTHOR("Marin Mitov <mitov@issp.bas.bg>");
diff --git a/drivers/staging/media/easycap/easycap_main.c b/drivers/staging/media/easycap/easycap_main.c
index a1c45e4dcdce..8269c77dbf7d 100644
--- a/drivers/staging/media/easycap/easycap_main.c
+++ b/drivers/staging/media/easycap/easycap_main.c
@@ -3083,6 +3083,7 @@ static int create_video_urbs(struct easycap *peasycap)
                 peasycap->allocation_video_urb += 1;
                 pdata_urb = kzalloc(sizeof(struct data_urb), GFP_KERNEL);
                 if (!pdata_urb) {
+                        usb_free_urb(purb);
                         SAM("ERROR: Could not allocate struct data_urb.\n");
                         return -ENOMEM;
                 }
diff --git a/drivers/staging/media/lirc/lirc_bt829.c b/drivers/staging/media/lirc/lirc_bt829.c
index 4d20e9f74118..951007a3fc96 100644
--- a/drivers/staging/media/lirc/lirc_bt829.c
+++ b/drivers/staging/media/lirc/lirc_bt829.c
@@ -171,7 +171,7 @@ static void cycle_delay(int cycle)
 }
 
 
-static int poll_main()
+static int poll_main(void)
 {
         unsigned char status_high, status_low;
 
diff --git a/drivers/staging/media/solo6x10/core.c b/drivers/staging/media/solo6x10/core.c
index d2fd842e37cf..3ee9b125797f 100644
--- a/drivers/staging/media/solo6x10/core.c
+++ b/drivers/staging/media/solo6x10/core.c
@@ -318,15 +318,4 @@ static struct pci_driver solo_pci_driver = {
         .remove = solo_pci_remove,
 };
 
-static int __init solo_module_init(void)
-{
-        return pci_register_driver(&solo_pci_driver);
-}
-
-static void __exit solo_module_exit(void)
-{
-        pci_unregister_driver(&solo_pci_driver);
-}
-
-module_init(solo_module_init);
-module_exit(solo_module_exit);
+module_pci_driver(solo_pci_driver);
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 2d7a9fe8f365..2ab31e4f02cc 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -1251,7 +1251,7 @@ static void remove_trip_attrs(struct thermal_zone_device *tz)
  * longer needed. The passive cooling formula uses tc1 and tc2 as described in
  * section 11.1.5.1 of the ACPI specification 3.0.
  */
-struct thermal_zone_device *thermal_zone_device_register(char *type,
+struct thermal_zone_device *thermal_zone_device_register(const char *type,
         int trips, int mask, void *devdata,
         const struct thermal_zone_device_ops *ops,
         int tc1, int tc2, int passive_delay, int polling_delay)
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index 6cd414341d5e..6579ffdd8e9b 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -216,8 +216,7 @@ static int ulite_startup(struct uart_port *port)
 {
         int ret;
 
-        ret = request_irq(port->irq, ulite_isr,
-                          IRQF_SHARED | IRQF_SAMPLE_RANDOM, "uartlite", port);
+        ret = request_irq(port->irq, ulite_isr, IRQF_SHARED, "uartlite", port);
         if (ret)
                 return ret;
 
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 821126eb8176..128a804c42f4 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -25,6 +25,7 @@
 #include <linux/kthread.h>
 #include <linux/mutex.h>
 #include <linux/freezer.h>
+#include <linux/random.h>
 
 #include <asm/uaccess.h>
 #include <asm/byteorder.h>
@@ -2181,6 +2182,14 @@ int usb_new_device(struct usb_device *udev)
         /* Tell the world! */
         announce_device(udev);
 
+        if (udev->serial)
+                add_device_randomness(udev->serial, strlen(udev->serial));
+        if (udev->product)
+                add_device_randomness(udev->product, strlen(udev->product));
+        if (udev->manufacturer)
+                add_device_randomness(udev->manufacturer,
+                                      strlen(udev->manufacturer));
+
         device_enable_async_suspend(&udev->dev);
 
         /*
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 3d28fb976c78..9fd7886cfa9a 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1836,7 +1836,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         /* init to known state, then setup irqs */
         udc_reset(dev);
         udc_reinit (dev);
-        if (request_irq(pdev->irq, goku_irq, IRQF_SHARED/*|IRQF_SAMPLE_RANDOM*/,
+        if (request_irq(pdev->irq, goku_irq, IRQF_SHARED,
                         driver_name, dev) != 0) {
                 DBG(dev, "request interrupt %d failed\n", pdev->irq);
                 retval = -EBUSY;
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 53c093b941e5..907ad3ecb341 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -2201,19 +2201,15 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_ARCH_LUBBOCK
         if (machine_is_lubbock()) {
-                retval = request_irq(LUBBOCK_USB_DISC_IRQ,
-                                lubbock_vbus_irq,
-                                IRQF_SAMPLE_RANDOM,
-                                driver_name, dev);
+                retval = request_irq(LUBBOCK_USB_DISC_IRQ, lubbock_vbus_irq,
+                                     0, driver_name, dev);
                 if (retval != 0) {
                         pr_err("%s: can't get irq %i, err %d\n",
                                 driver_name, LUBBOCK_USB_DISC_IRQ, retval);
                         goto err_irq_lub;
                 }
-                retval = request_irq(LUBBOCK_USB_IRQ,
-                                lubbock_vbus_irq,
-                                IRQF_SAMPLE_RANDOM,
-                                driver_name, dev);
+                retval = request_irq(LUBBOCK_USB_IRQ, lubbock_vbus_irq,
+                                     0, driver_name, dev);
                 if (retval != 0) {
                         pr_err("%s: can't get irq %i, err %d\n",
                                 driver_name, LUBBOCK_USB_IRQ, retval);
diff --git a/drivers/usb/otg/isp1301_omap.c b/drivers/usb/otg/isp1301_omap.c
index 575fc815c932..7a88667742b6 100644
--- a/drivers/usb/otg/isp1301_omap.c
+++ b/drivers/usb/otg/isp1301_omap.c
@@ -1576,7 +1576,6 @@ isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
                 isp->irq_type = IRQF_TRIGGER_FALLING;
         }
 
-        isp->irq_type |= IRQF_SAMPLE_RANDOM;
         status = request_irq(i2c->irq, isp1301_irq,
                         isp->irq_type, DRIVER_NAME, isp);
         if (status < 0) {
diff --git a/drivers/vfio/Kconfig b/drivers/vfio/Kconfig
new file mode 100644
index 000000000000..7cd5dec0abd1
--- /dev/null
+++ b/drivers/vfio/Kconfig
@@ -0,0 +1,16 @@
+config VFIO_IOMMU_TYPE1
+        tristate
+        depends on VFIO
+        default n
+
+menuconfig VFIO
+        tristate "VFIO Non-Privileged userspace driver framework"
+        depends on IOMMU_API
+        select VFIO_IOMMU_TYPE1 if X86
+        help
+          VFIO provides a framework for secure userspace device drivers.
+          See Documentation/vfio.txt for more details.
+
+          If you don't know what to do here, say N.
+
+source "drivers/vfio/pci/Kconfig"
diff --git a/drivers/vfio/Makefile b/drivers/vfio/Makefile
new file mode 100644
index 000000000000..2398d4a0e38b
--- /dev/null
+++ b/drivers/vfio/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_VFIO) += vfio.o
+obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o
+obj-$(CONFIG_VFIO_PCI) += pci/
diff --git a/drivers/vfio/pci/Kconfig b/drivers/vfio/pci/Kconfig
new file mode 100644
index 000000000000..5980758563eb
--- /dev/null
+++ b/drivers/vfio/pci/Kconfig
@@ -0,0 +1,8 @@
+config VFIO_PCI
+        tristate "VFIO support for PCI devices"
+        depends on VFIO && PCI && EVENTFD
+        help
+          Support for the PCI VFIO bus driver.  This is required to make
+          use of PCI drivers using the VFIO framework.
+
+          If you don't know what to do here, say N.
diff --git a/drivers/vfio/pci/Makefile b/drivers/vfio/pci/Makefile
new file mode 100644
index 000000000000..131079255fd9
--- /dev/null
+++ b/drivers/vfio/pci/Makefile
@@ -0,0 +1,4 @@
+
+vfio-pci-y := vfio_pci.o vfio_pci_intrs.o vfio_pci_rdwr.o vfio_pci_config.o
+
+obj-$(CONFIG_VFIO_PCI) += vfio-pci.o
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
new file mode 100644
index 000000000000..6968b7232232
--- /dev/null
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -0,0 +1,579 @@
+/*
+ * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
+ *     Author: Alex Williamson <alex.williamson@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Derived from original vfio:
+ * Copyright 2010 Cisco Systems, Inc.  All rights reserved.
+ * Author: Tom Lyon, pugs@cisco.com
+ */
+
+#include <linux/device.h>
+#include <linux/eventfd.h>
+#include <linux/interrupt.h>
+#include <linux/iommu.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/notifier.h>
+#include <linux/pci.h>
+#include <linux/pm_runtime.h>
+#include <linux/slab.h>
+#include <linux/types.h>
+#include <linux/uaccess.h>
+#include <linux/vfio.h>
+
+#include "vfio_pci_private.h"
+
+#define DRIVER_VERSION  "0.2"
+#define DRIVER_AUTHOR   "Alex Williamson <alex.williamson@redhat.com>"
+#define DRIVER_DESC     "VFIO PCI - User Level meta-driver"
+
+static bool nointxmask;
+module_param_named(nointxmask, nointxmask, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(nointxmask,
+                  "Disable support for PCI 2.3 style INTx masking.  If this resolves problems for specific devices, report lspci -vvvxxx to linux-pci@vger.kernel.org so the device can be fixed automatically via the broken_intx_masking flag.");
+
+static int vfio_pci_enable(struct vfio_pci_device *vdev)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        int ret;
+        u16 cmd;
+        u8 msix_pos;
+
+        vdev->reset_works = (pci_reset_function(pdev) == 0);
+        pci_save_state(pdev);
+        vdev->pci_saved_state = pci_store_saved_state(pdev);
+        if (!vdev->pci_saved_state)
+                pr_debug("%s: Couldn't store %s saved state\n",
+                         __func__, dev_name(&pdev->dev));
+
+        ret = vfio_config_init(vdev);
+        if (ret)
+                goto out;
+
+        if (likely(!nointxmask))
+                vdev->pci_2_3 = pci_intx_mask_supported(pdev);
+
+        pci_read_config_word(pdev, PCI_COMMAND, &cmd);
+        if (vdev->pci_2_3 && (cmd & PCI_COMMAND_INTX_DISABLE)) {
+                cmd &= ~PCI_COMMAND_INTX_DISABLE;
+                pci_write_config_word(pdev, PCI_COMMAND, cmd);
+        }
+
+        msix_pos = pci_find_capability(pdev, PCI_CAP_ID_MSIX);
+        if (msix_pos) {
+                u16 flags;
+                u32 table;
+
+                pci_read_config_word(pdev, msix_pos + PCI_MSIX_FLAGS, &flags);
+                pci_read_config_dword(pdev, msix_pos + PCI_MSIX_TABLE, &table);
+
+                vdev->msix_bar = table & PCI_MSIX_FLAGS_BIRMASK;
+                vdev->msix_offset = table & ~PCI_MSIX_FLAGS_BIRMASK;
+                vdev->msix_size = ((flags & PCI_MSIX_FLAGS_QSIZE) + 1) * 16;
+        } else
+                vdev->msix_bar = 0xFF;
+
+        ret = pci_enable_device(pdev);
+        if (ret)
+                goto out;
+
+        return ret;
+
+out:
+        kfree(vdev->pci_saved_state);
+        vdev->pci_saved_state = NULL;
+        vfio_config_free(vdev);
+        return ret;
+}
+
+static void vfio_pci_disable(struct vfio_pci_device *vdev)
+{
+        int bar;
+
+        pci_disable_device(vdev->pdev);
+
+        vfio_pci_set_irqs_ioctl(vdev, VFIO_IRQ_SET_DATA_NONE |
+                                VFIO_IRQ_SET_ACTION_TRIGGER,
+                                vdev->irq_type, 0, 0, NULL);
+
+        vdev->virq_disabled = false;
+
+        vfio_config_free(vdev);
+
+        pci_reset_function(vdev->pdev);
+
+        if (pci_load_and_free_saved_state(vdev->pdev,
+                                          &vdev->pci_saved_state) == 0)
+                pci_restore_state(vdev->pdev);
+        else
+                pr_info("%s: Couldn't reload %s saved state\n",
+                        __func__, dev_name(&vdev->pdev->dev));
+
+        for (bar = PCI_STD_RESOURCES; bar <= PCI_STD_RESOURCE_END; bar++) {
+                if (!vdev->barmap[bar])
+                        continue;
+                pci_iounmap(vdev->pdev, vdev->barmap[bar]);
+                pci_release_selected_regions(vdev->pdev, 1 << bar);
+                vdev->barmap[bar] = NULL;
+        }
+}
+
+static void vfio_pci_release(void *device_data)
+{
+        struct vfio_pci_device *vdev = device_data;
+
+        if (atomic_dec_and_test(&vdev->refcnt))
+                vfio_pci_disable(vdev);
+
+        module_put(THIS_MODULE);
+}
+
+static int vfio_pci_open(void *device_data)
+{
+        struct vfio_pci_device *vdev = device_data;
+
+        if (!try_module_get(THIS_MODULE))
+                return -ENODEV;
+
+        if (atomic_inc_return(&vdev->refcnt) == 1) {
+                int ret = vfio_pci_enable(vdev);
+                if (ret) {
+                        module_put(THIS_MODULE);
+                        return ret;
+                }
+        }
+
+        return 0;
+}
+
+static int vfio_pci_get_irq_count(struct vfio_pci_device *vdev, int irq_type)
+{
+        if (irq_type == VFIO_PCI_INTX_IRQ_INDEX) {
+                u8 pin;
+                pci_read_config_byte(vdev->pdev, PCI_INTERRUPT_PIN, &pin);
+                if (pin)
+                        return 1;
+
+        } else if (irq_type == VFIO_PCI_MSI_IRQ_INDEX) {
+                u8 pos;
+                u16 flags;
+
+                pos = pci_find_capability(vdev->pdev, PCI_CAP_ID_MSI);
+                if (pos) {
+                        pci_read_config_word(vdev->pdev,
+                                             pos + PCI_MSI_FLAGS, &flags);
+
+                        return 1 << (flags & PCI_MSI_FLAGS_QMASK);
+                }
+        } else if (irq_type == VFIO_PCI_MSIX_IRQ_INDEX) {
+                u8 pos;
+                u16 flags;
+
+                pos = pci_find_capability(vdev->pdev, PCI_CAP_ID_MSIX);
+                if (pos) {
+                        pci_read_config_word(vdev->pdev,
+                                             pos + PCI_MSIX_FLAGS, &flags);
+
+                        return (flags & PCI_MSIX_FLAGS_QSIZE) + 1;
+                }
+        }
+
+        return 0;
+}
+
+static long vfio_pci_ioctl(void *device_data,
+                           unsigned int cmd, unsigned long arg)
+{
+        struct vfio_pci_device *vdev = device_data;
+        unsigned long minsz;
+
+        if (cmd == VFIO_DEVICE_GET_INFO) {
+                struct vfio_device_info info;
+
+                minsz = offsetofend(struct vfio_device_info, num_irqs);
+
+                if (copy_from_user(&info, (void __user *)arg, minsz))
+                        return -EFAULT;
+
+                if (info.argsz < minsz)
+                        return -EINVAL;
+
+                info.flags = VFIO_DEVICE_FLAGS_PCI;
+
+                if (vdev->reset_works)
+                        info.flags |= VFIO_DEVICE_FLAGS_RESET;
+
+                info.num_regions = VFIO_PCI_NUM_REGIONS;
+                info.num_irqs = VFIO_PCI_NUM_IRQS;
+
+                return copy_to_user((void __user *)arg, &info, minsz);
+
+        } else if (cmd == VFIO_DEVICE_GET_REGION_INFO) {
+                struct pci_dev *pdev = vdev->pdev;
+                struct vfio_region_info info;
+
+                minsz = offsetofend(struct vfio_region_info, offset);
+
+                if (copy_from_user(&info, (void __user *)arg, minsz))
+                        return -EFAULT;
+
+                if (info.argsz < minsz)
+                        return -EINVAL;
+
+                switch (info.index) {
+                case VFIO_PCI_CONFIG_REGION_INDEX:
+                        info.offset = VFIO_PCI_INDEX_TO_OFFSET(info.index);
+                        info.size = pdev->cfg_size;
+                        info.flags = VFIO_REGION_INFO_FLAG_READ |
+                                     VFIO_REGION_INFO_FLAG_WRITE;
+                        break;
+                case VFIO_PCI_BAR0_REGION_INDEX ... VFIO_PCI_BAR5_REGION_INDEX:
+                        info.offset = VFIO_PCI_INDEX_TO_OFFSET(info.index);
+                        info.size = pci_resource_len(pdev, info.index);
+                        if (!info.size) {
+                                info.flags = 0;
+                                break;
+                        }
+
+                        info.flags = VFIO_REGION_INFO_FLAG_READ |
+                                     VFIO_REGION_INFO_FLAG_WRITE;
+                        if (pci_resource_flags(pdev, info.index) &
+                            IORESOURCE_MEM && info.size >= PAGE_SIZE)
+                                info.flags |= VFIO_REGION_INFO_FLAG_MMAP;
+                        break;
+                case VFIO_PCI_ROM_REGION_INDEX:
+                {
+                        void __iomem *io;
+                        size_t size;
+
+                        info.offset = VFIO_PCI_INDEX_TO_OFFSET(info.index);
+                        info.flags = 0;
+
+                        /* Report the BAR size, not the ROM size */
+                        info.size = pci_resource_len(pdev, info.index);
+                        if (!info.size)
+                                break;
+
+                        /* Is it really there? */
+                        io = pci_map_rom(pdev, &size);
+                        if (!io || !size) {
+                                info.size = 0;
+                                break;
+                        }
+                        pci_unmap_rom(pdev, io);
+
+                        info.flags = VFIO_REGION_INFO_FLAG_READ;
+                        break;
+                }
+                default:
+                        return -EINVAL;
+                }
+
+                return copy_to_user((void __user *)arg, &info, minsz);
+
+        } else if (cmd == VFIO_DEVICE_GET_IRQ_INFO) {
+                struct vfio_irq_info info;
+
+                minsz = offsetofend(struct vfio_irq_info, count);
+
+                if (copy_from_user(&info, (void __user *)arg, minsz))
+                        return -EFAULT;
+
+                if (info.argsz < minsz || info.index >= VFIO_PCI_NUM_IRQS)
+                        return -EINVAL;
+
+                info.flags = VFIO_IRQ_INFO_EVENTFD;
+
+                info.count = vfio_pci_get_irq_count(vdev, info.index);
+
+                if (info.index == VFIO_PCI_INTX_IRQ_INDEX)
+                        info.flags |= (VFIO_IRQ_INFO_MASKABLE |
+                                       VFIO_IRQ_INFO_AUTOMASKED);
+                else
+                        info.flags |= VFIO_IRQ_INFO_NORESIZE;
+
+                return copy_to_user((void __user *)arg, &info, minsz);
+
+        } else if (cmd == VFIO_DEVICE_SET_IRQS) {
+                struct vfio_irq_set hdr;
+                u8 *data = NULL;
+                int ret = 0;
+
+                minsz = offsetofend(struct vfio_irq_set, count);
+
+                if (copy_from_user(&hdr, (void __user *)arg, minsz))
+                        return -EFAULT;
+
+                if (hdr.argsz < minsz || hdr.index >= VFIO_PCI_NUM_IRQS ||
+                    hdr.flags & ~(VFIO_IRQ_SET_DATA_TYPE_MASK |
+                                  VFIO_IRQ_SET_ACTION_TYPE_MASK))
+                        return -EINVAL;
+
+                if (!(hdr.flags & VFIO_IRQ_SET_DATA_NONE)) {
+                        size_t size;
+
+                        if (hdr.flags & VFIO_IRQ_SET_DATA_BOOL)
+                                size = sizeof(uint8_t);
+                        else if (hdr.flags & VFIO_IRQ_SET_DATA_EVENTFD)
+                                size = sizeof(int32_t);
+                        else
+                                return -EINVAL;
+
+                        if (hdr.argsz - minsz < hdr.count * size ||
+                            hdr.count > vfio_pci_get_irq_count(vdev, hdr.index))
+                                return -EINVAL;
+
+                        data = kmalloc(hdr.count * size, GFP_KERNEL);
+                        if (!data)
+                                return -ENOMEM;
+
+                        if (copy_from_user(data, (void __user *)(arg + minsz),
+                                           hdr.count * size)) {
+                                kfree(data);
+                                return -EFAULT;
+                        }
+                }
+
+                mutex_lock(&vdev->igate);
+
+                ret = vfio_pci_set_irqs_ioctl(vdev, hdr.flags, hdr.index,
+                                              hdr.start, hdr.count, data);
+
+                mutex_unlock(&vdev->igate);
+                kfree(data);
+
+                return ret;
+
+        } else if (cmd == VFIO_DEVICE_RESET)
+                return vdev->reset_works ?
+                        pci_reset_function(vdev->pdev) : -EINVAL;
+
+        return -ENOTTY;
+}
+
+static ssize_t vfio_pci_read(void *device_data, char __user *buf,
+                             size_t count, loff_t *ppos)
+{
+        unsigned int index = VFIO_PCI_OFFSET_TO_INDEX(*ppos);
+        struct vfio_pci_device *vdev = device_data;
+        struct pci_dev *pdev = vdev->pdev;
+
+        if (index >= VFIO_PCI_NUM_REGIONS)
+                return -EINVAL;
+
+        if (index == VFIO_PCI_CONFIG_REGION_INDEX)
+                return vfio_pci_config_readwrite(vdev, buf, count, ppos, false);
+        else if (index == VFIO_PCI_ROM_REGION_INDEX)
+                return vfio_pci_mem_readwrite(vdev, buf, count, ppos, false);
+        else if (pci_resource_flags(pdev, index) & IORESOURCE_IO)
+                return vfio_pci_io_readwrite(vdev, buf, count, ppos, false);
+        else if (pci_resource_flags(pdev, index) & IORESOURCE_MEM)
+                return vfio_pci_mem_readwrite(vdev, buf, count, ppos, false);
+
+        return -EINVAL;
+}
+
+static ssize_t vfio_pci_write(void *device_data, const char __user *buf,
+                              size_t count, loff_t *ppos)
+{
+        unsigned int index = VFIO_PCI_OFFSET_TO_INDEX(*ppos);
+        struct vfio_pci_device *vdev = device_data;
+        struct pci_dev *pdev = vdev->pdev;
+
+        if (index >= VFIO_PCI_NUM_REGIONS)
+                return -EINVAL;
+
+        if (index == VFIO_PCI_CONFIG_REGION_INDEX)
+                return vfio_pci_config_readwrite(vdev, (char __user *)buf,
+                                                 count, ppos, true);
+        else if (index == VFIO_PCI_ROM_REGION_INDEX)
+                return -EINVAL;
+        else if (pci_resource_flags(pdev, index) & IORESOURCE_IO)
+                return vfio_pci_io_readwrite(vdev, (char __user *)buf,
+                                             count, ppos, true);
+        else if (pci_resource_flags(pdev, index) & IORESOURCE_MEM) {
+                return vfio_pci_mem_readwrite(vdev, (char __user *)buf,
+                                              count, ppos, true);
+        }
+
+        return -EINVAL;
+}
+
+static int vfio_pci_mmap(void *device_data, struct vm_area_struct *vma)
+{
+        struct vfio_pci_device *vdev = device_data;
+        struct pci_dev *pdev = vdev->pdev;
+        unsigned int index;
+        u64 phys_len, req_len, pgoff, req_start, phys;
+        int ret;
+
+        index = vma->vm_pgoff >> (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT);
+
+        if (vma->vm_end < vma->vm_start)
+                return -EINVAL;
+        if ((vma->vm_flags & VM_SHARED) == 0)
+                return -EINVAL;
+        if (index >= VFIO_PCI_ROM_REGION_INDEX)
+                return -EINVAL;
+        if (!(pci_resource_flags(pdev, index) & IORESOURCE_MEM))
+                return -EINVAL;
+
+        phys_len = pci_resource_len(pdev, index);
+        req_len = vma->vm_end - vma->vm_start;
+        pgoff = vma->vm_pgoff &
+                ((1U << (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT)) - 1);
+        req_start = pgoff << PAGE_SHIFT;
+
+        if (phys_len < PAGE_SIZE || req_start + req_len > phys_len)
+                return -EINVAL;
+
+        if (index == vdev->msix_bar) {
+                /*
+                 * Disallow mmaps overlapping the MSI-X table; users don't
+                 * get to touch this directly.  We could find somewhere
+                 * else to map the overlap, but page granularity is only
+                 * a recommendation, not a requirement, so the user needs
+                 * to know which bits are real.  Requiring them to mmap
+                 * around the table makes that clear.
+                 */
+
+                /* If neither entirely above nor below, then it overlaps */
+                if (!(req_start >= vdev->msix_offset + vdev->msix_size ||
+                      req_start + req_len <= vdev->msix_offset))
+                        return -EINVAL;
+        }
+
+        /*
+         * Even though we don't make use of the barmap for the mmap,
+         * we need to request the region and the barmap tracks that.
+         */
+        if (!vdev->barmap[index]) {
+                ret = pci_request_selected_regions(pdev,
+                                                   1 << index, "vfio-pci");
+                if (ret)
+                        return ret;
+
+                vdev->barmap[index] = pci_iomap(pdev, index, 0);
+        }
+
+        vma->vm_private_data = vdev;
+        vma->vm_flags |= (VM_IO | VM_RESERVED);
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+
+        phys = (pci_resource_start(pdev, index) >> PAGE_SHIFT) + pgoff;
+
+        return remap_pfn_range(vma, vma->vm_start, phys,
+                               req_len, vma->vm_page_prot);
+}
+
+static const struct vfio_device_ops vfio_pci_ops = {
+        .name           = "vfio-pci",
+        .open           = vfio_pci_open,
+        .release        = vfio_pci_release,
+        .ioctl          = vfio_pci_ioctl,
+        .read           = vfio_pci_read,
+        .write          = vfio_pci_write,
+        .mmap           = vfio_pci_mmap,
+};
+
+static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+{
+        u8 type;
+        struct vfio_pci_device *vdev;
+        struct iommu_group *group;
+        int ret;
+
+        pci_read_config_byte(pdev, PCI_HEADER_TYPE, &type);
+        if ((type & PCI_HEADER_TYPE) != PCI_HEADER_TYPE_NORMAL)
+                return -EINVAL;
+
+        group = iommu_group_get(&pdev->dev);
+        if (!group)
+                return -EINVAL;
+
+        vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
+        if (!vdev) {
+                iommu_group_put(group);
+                return -ENOMEM;
+        }
+
+        vdev->pdev = pdev;
+        vdev->irq_type = VFIO_PCI_NUM_IRQS;
+        mutex_init(&vdev->igate);
+        spin_lock_init(&vdev->irqlock);
+        atomic_set(&vdev->refcnt, 0);
+
+        ret = vfio_add_group_dev(&pdev->dev, &vfio_pci_ops, vdev);
+        if (ret) {
+                iommu_group_put(group);
+                kfree(vdev);
+        }
+
+        return ret;
+}
+
+static void vfio_pci_remove(struct pci_dev *pdev)
+{
+        struct vfio_pci_device *vdev;
+
+        vdev = vfio_del_group_dev(&pdev->dev);
+        if (!vdev)
+                return;
+
+        iommu_group_put(pdev->dev.iommu_group);
+        kfree(vdev);
+}
+
+static struct pci_driver vfio_pci_driver = {
+        .name           = "vfio-pci",
+        .id_table       = NULL, /* only dynamic ids */
+        .probe          = vfio_pci_probe,
+        .remove         = vfio_pci_remove,
+};
+
+static void __exit vfio_pci_cleanup(void)
+{
+        pci_unregister_driver(&vfio_pci_driver);
+        vfio_pci_virqfd_exit();
+        vfio_pci_uninit_perm_bits();
+}
+
+static int __init vfio_pci_init(void)
+{
+        int ret;
+
+        /* Allocate shared config space permision data used by all devices */
+        ret = vfio_pci_init_perm_bits();
+        if (ret)
+                return ret;
+
+        /* Start the virqfd cleanup handler */
+        ret = vfio_pci_virqfd_init();
+        if (ret)
+                goto out_virqfd;
+
+        /* Register and scan for devices */
+        ret = pci_register_driver(&vfio_pci_driver);
+        if (ret)
+                goto out_driver;
+
+        return 0;
+
+out_virqfd:
+        vfio_pci_virqfd_exit();
+out_driver:
+        vfio_pci_uninit_perm_bits();
+        return ret;
+}
+
+module_init(vfio_pci_init);
+module_exit(vfio_pci_cleanup);
+
+MODULE_VERSION(DRIVER_VERSION);
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c
new file mode 100644
index 000000000000..8b8f7d11e102
--- /dev/null
+++ b/drivers/vfio/pci/vfio_pci_config.c
@@ -0,0 +1,1540 @@
+/*
+ * VFIO PCI config space virtualization
+ *
+ * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
+ *     Author: Alex Williamson <alex.williamson@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Derived from original vfio:
+ * Copyright 2010 Cisco Systems, Inc.  All rights reserved.
+ * Author: Tom Lyon, pugs@cisco.com
+ */
+
+/*
+ * This code handles reading and writing of PCI configuration registers.
+ * This is hairy because we want to allow a lot of flexibility to the
+ * user driver, but cannot trust it with all of the config fields.
+ * Tables determine which fields can be read and written, as well as
+ * which fields are 'virtualized' - special actions and translations to
+ * make it appear to the user that he has control, when in fact things
+ * must be negotiated with the underlying OS.
+ */
+
+#include <linux/fs.h>
+#include <linux/pci.h>
+#include <linux/uaccess.h>
+#include <linux/vfio.h>
+
+#include "vfio_pci_private.h"
+
+#define PCI_CFG_SPACE_SIZE      256
+
+/* Useful "pseudo" capabilities */
+#define PCI_CAP_ID_BASIC        0
+#define PCI_CAP_ID_INVALID      0xFF
+
+#define is_bar(offset)  \
+        ((offset >= PCI_BASE_ADDRESS_0 && offset < PCI_BASE_ADDRESS_5 + 4) || \
+         (offset >= PCI_ROM_ADDRESS && offset < PCI_ROM_ADDRESS + 4))
+
+/*
+ * Lengths of PCI Config Capabilities
+ *   0: Removed from the user visible capability list
+ *   FF: Variable length
+ */
+static u8 pci_cap_length[] = {
+        [PCI_CAP_ID_BASIC]      = PCI_STD_HEADER_SIZEOF, /* pci config header */
+        [PCI_CAP_ID_PM]         = PCI_PM_SIZEOF,
+        [PCI_CAP_ID_AGP]        = PCI_AGP_SIZEOF,
+        [PCI_CAP_ID_VPD]        = PCI_CAP_VPD_SIZEOF,
+        [PCI_CAP_ID_SLOTID]     = 0,            /* bridge - don't care */
+        [PCI_CAP_ID_MSI]        = 0xFF,         /* 10, 14, 20, or 24 */
+        [PCI_CAP_ID_CHSWP]      = 0,            /* cpci - not yet */
+        [PCI_CAP_ID_PCIX]       = 0xFF,         /* 8 or 24 */
+        [PCI_CAP_ID_HT]         = 0xFF,         /* hypertransport */
+        [PCI_CAP_ID_VNDR]       = 0xFF,         /* variable */
+        [PCI_CAP_ID_DBG]        = 0,            /* debug - don't care */
+        [PCI_CAP_ID_CCRC]       = 0,            /* cpci - not yet */
+        [PCI_CAP_ID_SHPC]       = 0,            /* hotswap - not yet */
+        [PCI_CAP_ID_SSVID]      = 0,            /* bridge - don't care */
+        [PCI_CAP_ID_AGP3]       = 0,            /* AGP8x - not yet */
+        [PCI_CAP_ID_SECDEV]     = 0,            /* secure device not yet */
+        [PCI_CAP_ID_EXP]        = 0xFF,         /* 20 or 44 */
+        [PCI_CAP_ID_MSIX]       = PCI_CAP_MSIX_SIZEOF,
+        [PCI_CAP_ID_SATA]       = 0xFF,
+        [PCI_CAP_ID_AF]         = PCI_CAP_AF_SIZEOF,
+};
+
+/*
+ * Lengths of PCIe/PCI-X Extended Config Capabilities
+ *   0: Removed or masked from the user visible capabilty list
+ *   FF: Variable length
+ */
+static u16 pci_ext_cap_length[] = {
+        [PCI_EXT_CAP_ID_ERR]    =       PCI_ERR_ROOT_COMMAND,
+        [PCI_EXT_CAP_ID_VC]     =       0xFF,
+        [PCI_EXT_CAP_ID_DSN]    =       PCI_EXT_CAP_DSN_SIZEOF,
+        [PCI_EXT_CAP_ID_PWR]    =       PCI_EXT_CAP_PWR_SIZEOF,
+        [PCI_EXT_CAP_ID_RCLD]   =       0,      /* root only - don't care */
+        [PCI_EXT_CAP_ID_RCILC]  =       0,      /* root only - don't care */
+        [PCI_EXT_CAP_ID_RCEC]   =       0,      /* root only - don't care */
+        [PCI_EXT_CAP_ID_MFVC]   =       0xFF,
+        [PCI_EXT_CAP_ID_VC9]    =       0xFF,   /* same as CAP_ID_VC */
+        [PCI_EXT_CAP_ID_RCRB]   =       0,      /* root only - don't care */
+        [PCI_EXT_CAP_ID_VNDR]   =       0xFF,
+        [PCI_EXT_CAP_ID_CAC]    =       0,      /* obsolete */
+        [PCI_EXT_CAP_ID_ACS]    =       0xFF,
+        [PCI_EXT_CAP_ID_ARI]    =       PCI_EXT_CAP_ARI_SIZEOF,
+        [PCI_EXT_CAP_ID_ATS]    =       PCI_EXT_CAP_ATS_SIZEOF,
+        [PCI_EXT_CAP_ID_SRIOV]  =       PCI_EXT_CAP_SRIOV_SIZEOF,
+        [PCI_EXT_CAP_ID_MRIOV]  =       0,      /* not yet */
+        [PCI_EXT_CAP_ID_MCAST]  =       PCI_EXT_CAP_MCAST_ENDPOINT_SIZEOF,
+        [PCI_EXT_CAP_ID_PRI]    =       PCI_EXT_CAP_PRI_SIZEOF,
+        [PCI_EXT_CAP_ID_AMD_XXX] =      0,      /* not yet */
+        [PCI_EXT_CAP_ID_REBAR]  =       0xFF,
+        [PCI_EXT_CAP_ID_DPA]    =       0xFF,
+        [PCI_EXT_CAP_ID_TPH]    =       0xFF,
+        [PCI_EXT_CAP_ID_LTR]    =       PCI_EXT_CAP_LTR_SIZEOF,
+        [PCI_EXT_CAP_ID_SECPCI] =       0,      /* not yet */
+        [PCI_EXT_CAP_ID_PMUX]   =       0,      /* not yet */
+        [PCI_EXT_CAP_ID_PASID]  =       0,      /* not yet */
+};
+
+/*
+ * Read/Write Permission Bits - one bit for each bit in capability
+ * Any field can be read if it exists, but what is read depends on
+ * whether the field is 'virtualized', or just pass thru to the
+ * hardware.  Any virtualized field is also virtualized for writes.
+ * Writes are only permitted if they have a 1 bit here.
+ */
+struct perm_bits {
+        u8      *virt;          /* read/write virtual data, not hw */
+        u8      *write;         /* writeable bits */
+        int     (*readfn)(struct vfio_pci_device *vdev, int pos, int count,
+                          struct perm_bits *perm, int offset, __le32 *val);
+        int     (*writefn)(struct vfio_pci_device *vdev, int pos, int count,
+                           struct perm_bits *perm, int offset, __le32 val);
+};
+
+#define NO_VIRT         0
+#define ALL_VIRT        0xFFFFFFFFU
+#define NO_WRITE        0
+#define ALL_WRITE       0xFFFFFFFFU
+
+static int vfio_user_config_read(struct pci_dev *pdev, int offset,
+                                 __le32 *val, int count)
+{
+        int ret = -EINVAL;
+        u32 tmp_val = 0;
+
+        switch (count) {
+        case 1:
+        {
+                u8 tmp;
+                ret = pci_user_read_config_byte(pdev, offset, &tmp);
+                tmp_val = tmp;
+                break;
+        }
+        case 2:
+        {
+                u16 tmp;
+                ret = pci_user_read_config_word(pdev, offset, &tmp);
+                tmp_val = tmp;
+                break;
+        }
+        case 4:
+                ret = pci_user_read_config_dword(pdev, offset, &tmp_val);
+                break;
+        }
+
+        *val = cpu_to_le32(tmp_val);
+
+        return pcibios_err_to_errno(ret);
+}
+
+static int vfio_user_config_write(struct pci_dev *pdev, int offset,
+                                  __le32 val, int count)
+{
+        int ret = -EINVAL;
+        u32 tmp_val = le32_to_cpu(val);
+
+        switch (count) {
+        case 1:
+                ret = pci_user_write_config_byte(pdev, offset, tmp_val);
+                break;
+        case 2:
+                ret = pci_user_write_config_word(pdev, offset, tmp_val);
+                break;
+        case 4:
+                ret = pci_user_write_config_dword(pdev, offset, tmp_val);
+                break;
+        }
+
+        return pcibios_err_to_errno(ret);
+}
+
+static int vfio_default_config_read(struct vfio_pci_device *vdev, int pos,
+                                    int count, struct perm_bits *perm,
+                                    int offset, __le32 *val)
+{
+        __le32 virt = 0;
+
+        memcpy(val, vdev->vconfig + pos, count);
+
+        memcpy(&virt, perm->virt + offset, count);
+
+        /* Any non-virtualized bits? */
+        if (cpu_to_le32(~0U >> (32 - (count * 8))) != virt) {
+                struct pci_dev *pdev = vdev->pdev;
+                __le32 phys_val = 0;
+                int ret;
+
+                ret = vfio_user_config_read(pdev, pos, &phys_val, count);
+                if (ret)
+                        return ret;
+
+                *val = (phys_val & ~virt) | (*val & virt);
+        }
+
+        return count;
+}
+
+static int vfio_default_config_write(struct vfio_pci_device *vdev, int pos,
+                                     int count, struct perm_bits *perm,
+                                     int offset, __le32 val)
+{
+        __le32 virt = 0, write = 0;
+
+        memcpy(&write, perm->write + offset, count);
+
+        if (!write)
+                return count; /* drop, no writable bits */
+
+        memcpy(&virt, perm->virt + offset, count);
+
+        /* Virtualized and writable bits go to vconfig */
+        if (write & virt) {
+                __le32 virt_val = 0;
+
+                memcpy(&virt_val, vdev->vconfig + pos, count);
+
+                virt_val &= ~(write & virt);
+                virt_val |= (val & (write & virt));
+
+                memcpy(vdev->vconfig + pos, &virt_val, count);
+        }
+
+        /* Non-virtualzed and writable bits go to hardware */
+        if (write & ~virt) {
+                struct pci_dev *pdev = vdev->pdev;
+                __le32 phys_val = 0;
+                int ret;
+
+                ret = vfio_user_config_read(pdev, pos, &phys_val, count);
+                if (ret)
+                        return ret;
+
+                phys_val &= ~(write & ~virt);
+                phys_val |= (val & (write & ~virt));
+
+                ret = vfio_user_config_write(pdev, pos, phys_val, count);
+                if (ret)
+                        return ret;
+        }
+
+        return count;
+}
+
+/* Allow direct read from hardware, except for capability next pointer */
+static int vfio_direct_config_read(struct vfio_pci_device *vdev, int pos,
+                                   int count, struct perm_bits *perm,
+                                   int offset, __le32 *val)
+{
+        int ret;
+
+        ret = vfio_user_config_read(vdev->pdev, pos, val, count);
+        if (ret)
+                return pcibios_err_to_errno(ret);
+
+        if (pos >= PCI_CFG_SPACE_SIZE) { /* Extended cap header mangling */
+                if (offset < 4)
+                        memcpy(val, vdev->vconfig + pos, count);
+        } else if (pos >= PCI_STD_HEADER_SIZEOF) { /* Std cap mangling */
+                if (offset == PCI_CAP_LIST_ID && count > 1)
+                        memcpy(val, vdev->vconfig + pos,
+                               min(PCI_CAP_FLAGS, count));
+                else if (offset == PCI_CAP_LIST_NEXT)
+                        memcpy(val, vdev->vconfig + pos, 1);
+        }
+
+        return count;
+}
+
+static int vfio_direct_config_write(struct vfio_pci_device *vdev, int pos,
+                                    int count, struct perm_bits *perm,
+                                    int offset, __le32 val)
+{
+        int ret;
+
+        ret = vfio_user_config_write(vdev->pdev, pos, val, count);
+        if (ret)
+                return ret;
+
+        return count;
+}
+
+/* Default all regions to read-only, no-virtualization */
+static struct perm_bits cap_perms[PCI_CAP_ID_MAX + 1] = {
+        [0 ... PCI_CAP_ID_MAX] = { .readfn = vfio_direct_config_read }
+};
+static struct perm_bits ecap_perms[PCI_EXT_CAP_ID_MAX + 1] = {
+        [0 ... PCI_EXT_CAP_ID_MAX] = { .readfn = vfio_direct_config_read }
+};
+
+static void free_perm_bits(struct perm_bits *perm)
+{
+        kfree(perm->virt);
+        kfree(perm->write);
+        perm->virt = NULL;
+        perm->write = NULL;
+}
+
+static int alloc_perm_bits(struct perm_bits *perm, int size)
+{
+        /*
+         * Round up all permission bits to the next dword, this lets us
+         * ignore whether a read/write exceeds the defined capability
+         * structure.  We can do this because:
+         *  - Standard config space is already dword aligned
+         *  - Capabilities are all dword alinged (bits 0:1 of next reserved)
+         *  - Express capabilities defined as dword aligned
+         */
+        size = round_up(size, 4);
+
+        /*
+         * Zero state is
+         * - All Readable, None Writeable, None Virtualized
+         */
+        perm->virt = kzalloc(size, GFP_KERNEL);
+        perm->write = kzalloc(size, GFP_KERNEL);
+        if (!perm->virt || !perm->write) {
+                free_perm_bits(perm);
+                return -ENOMEM;
+        }
+
+        perm->readfn = vfio_default_config_read;
+        perm->writefn = vfio_default_config_write;
+
+        return 0;
+}
+
+/*
+ * Helper functions for filling in permission tables
+ */
+static inline void p_setb(struct perm_bits *p, int off, u8 virt, u8 write)
+{
+        p->virt[off] = virt;
+        p->write[off] = write;
+}
+
+/* Handle endian-ness - pci and tables are little-endian */
+static inline void p_setw(struct perm_bits *p, int off, u16 virt, u16 write)
+{
+        *(__le16 *)(&p->virt[off]) = cpu_to_le16(virt);
+        *(__le16 *)(&p->write[off]) = cpu_to_le16(write);
+}
+
+/* Handle endian-ness - pci and tables are little-endian */
+static inline void p_setd(struct perm_bits *p, int off, u32 virt, u32 write)
+{
+        *(__le32 *)(&p->virt[off]) = cpu_to_le32(virt);
+        *(__le32 *)(&p->write[off]) = cpu_to_le32(write);
+}
+
+/*
+ * Restore the *real* BARs after we detect a FLR or backdoor reset.
+ * (backdoor = some device specific technique that we didn't catch)
+ */
+static void vfio_bar_restore(struct vfio_pci_device *vdev)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        u32 *rbar = vdev->rbar;
+        int i;
+
+        if (pdev->is_virtfn)
+                return;
+
+        pr_info("%s: %s reset recovery - restoring bars\n",
+                __func__, dev_name(&pdev->dev));
+
+        for (i = PCI_BASE_ADDRESS_0; i <= PCI_BASE_ADDRESS_5; i += 4, rbar++)
+                pci_user_write_config_dword(pdev, i, *rbar);
+
+        pci_user_write_config_dword(pdev, PCI_ROM_ADDRESS, *rbar);
+}
+
+static __le32 vfio_generate_bar_flags(struct pci_dev *pdev, int bar)
+{
+        unsigned long flags = pci_resource_flags(pdev, bar);
+        u32 val;
+
+        if (flags & IORESOURCE_IO)
+                return cpu_to_le32(PCI_BASE_ADDRESS_SPACE_IO);
+
+        val = PCI_BASE_ADDRESS_SPACE_MEMORY;
+
+        if (flags & IORESOURCE_PREFETCH)
+                val |= PCI_BASE_ADDRESS_MEM_PREFETCH;
+
+        if (flags & IORESOURCE_MEM_64)
+                val |= PCI_BASE_ADDRESS_MEM_TYPE_64;
+
+        return cpu_to_le32(val);
+}
+
+/*
+ * Pretend we're hardware and tweak the values of the *virtual* PCI BARs
+ * to reflect the hardware capabilities.  This implements BAR sizing.
+ */
+static void vfio_bar_fixup(struct vfio_pci_device *vdev)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        int i;
+        __le32 *bar;
+        u64 mask;
+
+        bar = (__le32 *)&vdev->vconfig[PCI_BASE_ADDRESS_0];
+
+        for (i = PCI_STD_RESOURCES; i <= PCI_STD_RESOURCE_END; i++, bar++) {
+                if (!pci_resource_start(pdev, i)) {
+                        *bar = 0; /* Unmapped by host = unimplemented to user */
+                        continue;
+                }
+
+                mask = ~(pci_resource_len(pdev, i) - 1);
+
+                *bar &= cpu_to_le32((u32)mask);
+                *bar |= vfio_generate_bar_flags(pdev, i);
+
+                if (*bar & cpu_to_le32(PCI_BASE_ADDRESS_MEM_TYPE_64)) {
+                        bar++;
+                        *bar &= cpu_to_le32((u32)(mask >> 32));
+                        i++;
+                }
+        }
+
+        bar = (__le32 *)&vdev->vconfig[PCI_ROM_ADDRESS];
+
+        /*
+         * NB. we expose the actual BAR size here, regardless of whether
+         * we can read it.  When we report the REGION_INFO for the ROM
+         * we report what PCI tells us is the actual ROM size.
+         */
+        if (pci_resource_start(pdev, PCI_ROM_RESOURCE)) {
+                mask = ~(pci_resource_len(pdev, PCI_ROM_RESOURCE) - 1);
+                mask |= PCI_ROM_ADDRESS_ENABLE;
+                *bar &= cpu_to_le32((u32)mask);
+        } else
+                *bar = 0;
+
+        vdev->bardirty = false;
+}
+
+static int vfio_basic_config_read(struct vfio_pci_device *vdev, int pos,
+                                  int count, struct perm_bits *perm,
+                                  int offset, __le32 *val)
+{
+        if (is_bar(offset)) /* pos == offset for basic config */
+                vfio_bar_fixup(vdev);
+
+        count = vfio_default_config_read(vdev, pos, count, perm, offset, val);
+
+        /* Mask in virtual memory enable for SR-IOV devices */
+        if (offset == PCI_COMMAND && vdev->pdev->is_virtfn) {
+                u16 cmd = le16_to_cpu(*(__le16 *)&vdev->vconfig[PCI_COMMAND]);
+                u32 tmp_val = le32_to_cpu(*val);
+
+                tmp_val |= cmd & PCI_COMMAND_MEMORY;
+                *val = cpu_to_le32(tmp_val);
+        }
+
+        return count;
+}
+
+static int vfio_basic_config_write(struct vfio_pci_device *vdev, int pos,
+                                   int count, struct perm_bits *perm,
+                                   int offset, __le32 val)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        __le16 *virt_cmd;
+        u16 new_cmd = 0;
+        int ret;
+
+        virt_cmd = (__le16 *)&vdev->vconfig[PCI_COMMAND];
+
+        if (offset == PCI_COMMAND) {
+                bool phys_mem, virt_mem, new_mem, phys_io, virt_io, new_io;
+                u16 phys_cmd;
+
+                ret = pci_user_read_config_word(pdev, PCI_COMMAND, &phys_cmd);
+                if (ret)
+                        return ret;
+
+                new_cmd = le32_to_cpu(val);
+
+                phys_mem = !!(phys_cmd & PCI_COMMAND_MEMORY);
+                virt_mem = !!(le16_to_cpu(*virt_cmd) & PCI_COMMAND_MEMORY);
+                new_mem = !!(new_cmd & PCI_COMMAND_MEMORY);
+
+                phys_io = !!(phys_cmd & PCI_COMMAND_IO);
+                virt_io = !!(le16_to_cpu(*virt_cmd) & PCI_COMMAND_IO);
+                new_io = !!(new_cmd & PCI_COMMAND_IO);
+
+                /*
+                 * If the user is writing mem/io enable (new_mem/io) and we
+                 * think it's already enabled (virt_mem/io), but the hardware
+                 * shows it disabled (phys_mem/io, then the device has
+                 * undergone some kind of backdoor reset and needs to be
+                 * restored before we allow it to enable the bars.
+                 * SR-IOV devices will trigger this, but we catch them later
+                 */
+                if ((new_mem && virt_mem && !phys_mem) ||
+                    (new_io && virt_io && !phys_io))
+                        vfio_bar_restore(vdev);
+        }
+
+        count = vfio_default_config_write(vdev, pos, count, perm, offset, val);
+        if (count < 0)
+                return count;
+
+        /*
+         * Save current memory/io enable bits in vconfig to allow for
+         * the test above next time.
+         */
+        if (offset == PCI_COMMAND) {
+                u16 mask = PCI_COMMAND_MEMORY | PCI_COMMAND_IO;
+
+                *virt_cmd &= cpu_to_le16(~mask);
+                *virt_cmd |= cpu_to_le16(new_cmd & mask);
+        }
+
+        /* Emulate INTx disable */
+        if (offset >= PCI_COMMAND && offset <= PCI_COMMAND + 1) {
+                bool virt_intx_disable;
+
+                virt_intx_disable = !!(le16_to_cpu(*virt_cmd) &
+                                       PCI_COMMAND_INTX_DISABLE);
+
+                if (virt_intx_disable && !vdev->virq_disabled) {
+                        vdev->virq_disabled = true;
+                        vfio_pci_intx_mask(vdev);
+                } else if (!virt_intx_disable && vdev->virq_disabled) {
+                        vdev->virq_disabled = false;
+                        vfio_pci_intx_unmask(vdev);
+                }
+        }
+
+        if (is_bar(offset))
+                vdev->bardirty = true;
+
+        return count;
+}
+
+/* Permissions for the Basic PCI Header */
+static int __init init_pci_cap_basic_perm(struct perm_bits *perm)
+{
+        if (alloc_perm_bits(perm, PCI_STD_HEADER_SIZEOF))
+                return -ENOMEM;
+
+        perm->readfn = vfio_basic_config_read;
+        perm->writefn = vfio_basic_config_write;
+
+        /* Virtualized for SR-IOV functions, which just have FFFF */
+        p_setw(perm, PCI_VENDOR_ID, (u16)ALL_VIRT, NO_WRITE);
+        p_setw(perm, PCI_DEVICE_ID, (u16)ALL_VIRT, NO_WRITE);
+
+        /*
+         * Virtualize INTx disable, we use it internally for interrupt
+         * control and can emulate it for non-PCI 2.3 devices.
+         */
+        p_setw(perm, PCI_COMMAND, PCI_COMMAND_INTX_DISABLE, (u16)ALL_WRITE);
+
+        /* Virtualize capability list, we might want to skip/disable */
+        p_setw(perm, PCI_STATUS, PCI_STATUS_CAP_LIST, NO_WRITE);
+
+        /* No harm to write */
+        p_setb(perm, PCI_CACHE_LINE_SIZE, NO_VIRT, (u8)ALL_WRITE);
+        p_setb(perm, PCI_LATENCY_TIMER, NO_VIRT, (u8)ALL_WRITE);
+        p_setb(perm, PCI_BIST, NO_VIRT, (u8)ALL_WRITE);
+
+        /* Virtualize all bars, can't touch the real ones */
+        p_setd(perm, PCI_BASE_ADDRESS_0, ALL_VIRT, ALL_WRITE);
+        p_setd(perm, PCI_BASE_ADDRESS_1, ALL_VIRT, ALL_WRITE);
+        p_setd(perm, PCI_BASE_ADDRESS_2, ALL_VIRT, ALL_WRITE);
+        p_setd(perm, PCI_BASE_ADDRESS_3, ALL_VIRT, ALL_WRITE);
+        p_setd(perm, PCI_BASE_ADDRESS_4, ALL_VIRT, ALL_WRITE);
+        p_setd(perm, PCI_BASE_ADDRESS_5, ALL_VIRT, ALL_WRITE);
+        p_setd(perm, PCI_ROM_ADDRESS, ALL_VIRT, ALL_WRITE);
+
+        /* Allow us to adjust capability chain */
+        p_setb(perm, PCI_CAPABILITY_LIST, (u8)ALL_VIRT, NO_WRITE);
+
+        /* Sometimes used by sw, just virtualize */
+        p_setb(perm, PCI_INTERRUPT_LINE, (u8)ALL_VIRT, (u8)ALL_WRITE);
+        return 0;
+}
+
+/* Permissions for the Power Management capability */
+static int __init init_pci_cap_pm_perm(struct perm_bits *perm)
+{
+        if (alloc_perm_bits(perm, pci_cap_length[PCI_CAP_ID_PM]))
+                return -ENOMEM;
+
+        /*
+         * We always virtualize the next field so we can remove
+         * capabilities from the chain if we want to.
+         */
+        p_setb(perm, PCI_CAP_LIST_NEXT, (u8)ALL_VIRT, NO_WRITE);
+
+        /*
+         * Power management is defined *per function*,
+         * so we let the user write this
+         */
+        p_setd(perm, PCI_PM_CTRL, NO_VIRT, ALL_WRITE);
+        return 0;
+}
+
+/* Permissions for PCI-X capability */
+static int __init init_pci_cap_pcix_perm(struct perm_bits *perm)
+{
+        /* Alloc 24, but only 8 are used in v0 */
+        if (alloc_perm_bits(perm, PCI_CAP_PCIX_SIZEOF_V2))
+                return -ENOMEM;
+
+        p_setb(perm, PCI_CAP_LIST_NEXT, (u8)ALL_VIRT, NO_WRITE);
+
+        p_setw(perm, PCI_X_CMD, NO_VIRT, (u16)ALL_WRITE);
+        p_setd(perm, PCI_X_ECC_CSR, NO_VIRT, ALL_WRITE);
+        return 0;
+}
+
+/* Permissions for PCI Express capability */
+static int __init init_pci_cap_exp_perm(struct perm_bits *perm)
+{
+        /* Alloc larger of two possible sizes */
+        if (alloc_perm_bits(perm, PCI_CAP_EXP_ENDPOINT_SIZEOF_V2))
+                return -ENOMEM;
+
+        p_setb(perm, PCI_CAP_LIST_NEXT, (u8)ALL_VIRT, NO_WRITE);
+
+        /*
+         * Allow writes to device control fields (includes FLR!)
+         * but not to devctl_phantom which could confuse IOMMU
+         * or to the ARI bit in devctl2 which is set at probe time
+         */
+        p_setw(perm, PCI_EXP_DEVCTL, NO_VIRT, ~PCI_EXP_DEVCTL_PHANTOM);
+        p_setw(perm, PCI_EXP_DEVCTL2, NO_VIRT, ~PCI_EXP_DEVCTL2_ARI);
+        return 0;
+}
+
+/* Permissions for Advanced Function capability */
+static int __init init_pci_cap_af_perm(struct perm_bits *perm)
+{
+        if (alloc_perm_bits(perm, pci_cap_length[PCI_CAP_ID_AF]))
+                return -ENOMEM;
+
+        p_setb(perm, PCI_CAP_LIST_NEXT, (u8)ALL_VIRT, NO_WRITE);
+        p_setb(perm, PCI_AF_CTRL, NO_VIRT, PCI_AF_CTRL_FLR);
+        return 0;
+}
+
+/* Permissions for Advanced Error Reporting extended capability */
+static int __init init_pci_ext_cap_err_perm(struct perm_bits *perm)
+{
+        u32 mask;
+
+        if (alloc_perm_bits(perm, pci_ext_cap_length[PCI_EXT_CAP_ID_ERR]))
+                return -ENOMEM;
+
+        /*
+         * Virtualize the first dword of all express capabilities
+         * because it includes the next pointer.  This lets us later
+         * remove capabilities from the chain if we need to.
+         */
+        p_setd(perm, 0, ALL_VIRT, NO_WRITE);
+
+        /* Writable bits mask */
+        mask =  PCI_ERR_UNC_TRAIN |             /* Training */
+                PCI_ERR_UNC_DLP |               /* Data Link Protocol */
+                PCI_ERR_UNC_SURPDN |            /* Surprise Down */
+                PCI_ERR_UNC_POISON_TLP |        /* Poisoned TLP */
+                PCI_ERR_UNC_FCP |               /* Flow Control Protocol */
+                PCI_ERR_UNC_COMP_TIME |         /* Completion Timeout */
+                PCI_ERR_UNC_COMP_ABORT |        /* Completer Abort */
+                PCI_ERR_UNC_UNX_COMP |          /* Unexpected Completion */
+                PCI_ERR_UNC_RX_OVER |           /* Receiver Overflow */
+                PCI_ERR_UNC_MALF_TLP |          /* Malformed TLP */
+                PCI_ERR_UNC_ECRC |              /* ECRC Error Status */
+                PCI_ERR_UNC_UNSUP |             /* Unsupported Request */
+                PCI_ERR_UNC_ACSV |              /* ACS Violation */
+                PCI_ERR_UNC_INTN |              /* internal error */
+                PCI_ERR_UNC_MCBTLP |            /* MC blocked TLP */
+                PCI_ERR_UNC_ATOMEG |            /* Atomic egress blocked */
+                PCI_ERR_UNC_TLPPRE;             /* TLP prefix blocked */
+        p_setd(perm, PCI_ERR_UNCOR_STATUS, NO_VIRT, mask);
+        p_setd(perm, PCI_ERR_UNCOR_MASK, NO_VIRT, mask);
+        p_setd(perm, PCI_ERR_UNCOR_SEVER, NO_VIRT, mask);
+
+        mask =  PCI_ERR_COR_RCVR |              /* Receiver Error Status */
+                PCI_ERR_COR_BAD_TLP |           /* Bad TLP Status */
+                PCI_ERR_COR_BAD_DLLP |          /* Bad DLLP Status */
+                PCI_ERR_COR_REP_ROLL |          /* REPLAY_NUM Rollover */
+                PCI_ERR_COR_REP_TIMER |         /* Replay Timer Timeout */
+                PCI_ERR_COR_ADV_NFAT |          /* Advisory Non-Fatal */
+                PCI_ERR_COR_INTERNAL |          /* Corrected Internal */
+                PCI_ERR_COR_LOG_OVER;           /* Header Log Overflow */
+        p_setd(perm, PCI_ERR_COR_STATUS, NO_VIRT, mask);
+        p_setd(perm, PCI_ERR_COR_MASK, NO_VIRT, mask);
+
+        mask =  PCI_ERR_CAP_ECRC_GENE |         /* ECRC Generation Enable */
+                PCI_ERR_CAP_ECRC_CHKE;          /* ECRC Check Enable */
+        p_setd(perm, PCI_ERR_CAP, NO_VIRT, mask);
+        return 0;
+}
+
+/* Permissions for Power Budgeting extended capability */
+static int __init init_pci_ext_cap_pwr_perm(struct perm_bits *perm)
+{
+        if (alloc_perm_bits(perm, pci_ext_cap_length[PCI_EXT_CAP_ID_PWR]))
+                return -ENOMEM;
+
+        p_setd(perm, 0, ALL_VIRT, NO_WRITE);
+
+        /* Writing the data selector is OK, the info is still read-only */
+        p_setb(perm, PCI_PWR_DATA, NO_VIRT, (u8)ALL_WRITE);
+        return 0;
+}
+
+/*
+ * Initialize the shared permission tables
+ */
+void vfio_pci_uninit_perm_bits(void)
+{
+        free_perm_bits(&cap_perms[PCI_CAP_ID_BASIC]);
+
+        free_perm_bits(&cap_perms[PCI_CAP_ID_PM]);
+        free_perm_bits(&cap_perms[PCI_CAP_ID_PCIX]);
+        free_perm_bits(&cap_perms[PCI_CAP_ID_EXP]);
+        free_perm_bits(&cap_perms[PCI_CAP_ID_AF]);
+
+        free_perm_bits(&ecap_perms[PCI_EXT_CAP_ID_ERR]);
+        free_perm_bits(&ecap_perms[PCI_EXT_CAP_ID_PWR]);
+}
+
+int __init vfio_pci_init_perm_bits(void)
+{
+        int ret;
+
+        /* Basic config space */
+        ret = init_pci_cap_basic_perm(&cap_perms[PCI_CAP_ID_BASIC]);
+
+        /* Capabilities */
+        ret |= init_pci_cap_pm_perm(&cap_perms[PCI_CAP_ID_PM]);
+        cap_perms[PCI_CAP_ID_VPD].writefn = vfio_direct_config_write;
+        ret |= init_pci_cap_pcix_perm(&cap_perms[PCI_CAP_ID_PCIX]);
+        cap_perms[PCI_CAP_ID_VNDR].writefn = vfio_direct_config_write;
+        ret |= init_pci_cap_exp_perm(&cap_perms[PCI_CAP_ID_EXP]);
+        ret |= init_pci_cap_af_perm(&cap_perms[PCI_CAP_ID_AF]);
+
+        /* Extended capabilities */
+        ret |= init_pci_ext_cap_err_perm(&ecap_perms[PCI_EXT_CAP_ID_ERR]);
+        ret |= init_pci_ext_cap_pwr_perm(&ecap_perms[PCI_EXT_CAP_ID_PWR]);
+        ecap_perms[PCI_EXT_CAP_ID_VNDR].writefn = vfio_direct_config_write;
+
+        if (ret)
+                vfio_pci_uninit_perm_bits();
+
+        return ret;
+}
+
+static int vfio_find_cap_start(struct vfio_pci_device *vdev, int pos)
+{
+        u8 cap;
+        int base = (pos >= PCI_CFG_SPACE_SIZE) ? PCI_CFG_SPACE_SIZE :
+                                                 PCI_STD_HEADER_SIZEOF;
+        base /= 4;
+        pos /= 4;
+
+        cap = vdev->pci_config_map[pos];
+
+        if (cap == PCI_CAP_ID_BASIC)
+                return 0;
+
+        /* XXX Can we have to abutting capabilities of the same type? */
+        while (pos - 1 >= base && vdev->pci_config_map[pos - 1] == cap)
+                pos--;
+
+        return pos * 4;
+}
+
+static int vfio_msi_config_read(struct vfio_pci_device *vdev, int pos,
+                                int count, struct perm_bits *perm,
+                                int offset, __le32 *val)
+{
+        /* Update max available queue size from msi_qmax */
+        if (offset <= PCI_MSI_FLAGS && offset + count >= PCI_MSI_FLAGS) {
+                __le16 *flags;
+                int start;
+
+                start = vfio_find_cap_start(vdev, pos);
+
+                flags = (__le16 *)&vdev->vconfig[start];
+
+                *flags &= cpu_to_le16(~PCI_MSI_FLAGS_QMASK);
+                *flags |= cpu_to_le16(vdev->msi_qmax << 1);
+        }
+
+        return vfio_default_config_read(vdev, pos, count, perm, offset, val);
+}
+
+static int vfio_msi_config_write(struct vfio_pci_device *vdev, int pos,
+                                 int count, struct perm_bits *perm,
+                                 int offset, __le32 val)
+{
+        count = vfio_default_config_write(vdev, pos, count, perm, offset, val);
+        if (count < 0)
+                return count;
+
+        /* Fixup and write configured queue size and enable to hardware */
+        if (offset <= PCI_MSI_FLAGS && offset + count >= PCI_MSI_FLAGS) {
+                __le16 *pflags;
+                u16 flags;
+                int start, ret;
+
+                start = vfio_find_cap_start(vdev, pos);
+
+                pflags = (__le16 *)&vdev->vconfig[start + PCI_MSI_FLAGS];
+
+                flags = le16_to_cpu(*pflags);
+
+                /* MSI is enabled via ioctl */
+                if  (!is_msi(vdev))
+                        flags &= ~PCI_MSI_FLAGS_ENABLE;
+
+                /* Check queue size */
+                if ((flags & PCI_MSI_FLAGS_QSIZE) >> 4 > vdev->msi_qmax) {
+                        flags &= ~PCI_MSI_FLAGS_QSIZE;
+                        flags |= vdev->msi_qmax << 4;
+                }
+
+                /* Write back to virt and to hardware */
+                *pflags = cpu_to_le16(flags);
+                ret = pci_user_write_config_word(vdev->pdev,
+                                                 start + PCI_MSI_FLAGS,
+                                                 flags);
+                if (ret)
+                        return pcibios_err_to_errno(ret);
+        }
+
+        return count;
+}
+
+/*
+ * MSI determination is per-device, so this routine gets used beyond
+ * initialization time. Don't add __init
+ */
+static int init_pci_cap_msi_perm(struct perm_bits *perm, int len, u16 flags)
+{
+        if (alloc_perm_bits(perm, len))
+                return -ENOMEM;
+
+        perm->readfn = vfio_msi_config_read;
+        perm->writefn = vfio_msi_config_write;
+
+        p_setb(perm, PCI_CAP_LIST_NEXT, (u8)ALL_VIRT, NO_WRITE);
+
+        /*
+         * The upper byte of the control register is reserved,
+         * just setup the lower byte.
+         */
+        p_setb(perm, PCI_MSI_FLAGS, (u8)ALL_VIRT, (u8)ALL_WRITE);
+        p_setd(perm, PCI_MSI_ADDRESS_LO, ALL_VIRT, ALL_WRITE);
+        if (flags & PCI_MSI_FLAGS_64BIT) {
+                p_setd(perm, PCI_MSI_ADDRESS_HI, ALL_VIRT, ALL_WRITE);
+                p_setw(perm, PCI_MSI_DATA_64, (u16)ALL_VIRT, (u16)ALL_WRITE);
+                if (flags & PCI_MSI_FLAGS_MASKBIT) {
+                        p_setd(perm, PCI_MSI_MASK_64, NO_VIRT, ALL_WRITE);
+                        p_setd(perm, PCI_MSI_PENDING_64, NO_VIRT, ALL_WRITE);
+                }
+        } else {
+                p_setw(perm, PCI_MSI_DATA_32, (u16)ALL_VIRT, (u16)ALL_WRITE);
+                if (flags & PCI_MSI_FLAGS_MASKBIT) {
+                        p_setd(perm, PCI_MSI_MASK_32, NO_VIRT, ALL_WRITE);
+                        p_setd(perm, PCI_MSI_PENDING_32, NO_VIRT, ALL_WRITE);
+                }
+        }
+        return 0;
+}
+
+/* Determine MSI CAP field length; initialize msi_perms on 1st call per vdev */
+static int vfio_msi_cap_len(struct vfio_pci_device *vdev, u8 pos)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        int len, ret;
+        u16 flags;
+
+        ret = pci_read_config_word(pdev, pos + PCI_MSI_FLAGS, &flags);
+        if (ret)
+                return pcibios_err_to_errno(ret);
+
+        len = 10; /* Minimum size */
+        if (flags & PCI_MSI_FLAGS_64BIT)
+                len += 4;
+        if (flags & PCI_MSI_FLAGS_MASKBIT)
+                len += 10;
+
+        if (vdev->msi_perm)
+                return len;
+
+        vdev->msi_perm = kmalloc(sizeof(struct perm_bits), GFP_KERNEL);
+        if (!vdev->msi_perm)
+                return -ENOMEM;
+
+        ret = init_pci_cap_msi_perm(vdev->msi_perm, len, flags);
+        if (ret)
+                return ret;
+
+        return len;
+}
+
+/* Determine extended capability length for VC (2 & 9) and MFVC */
+static int vfio_vc_cap_len(struct vfio_pci_device *vdev, u16 pos)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        u32 tmp;
+        int ret, evcc, phases, vc_arb;
+        int len = PCI_CAP_VC_BASE_SIZEOF;
+
+        ret = pci_read_config_dword(pdev, pos + PCI_VC_PORT_REG1, &tmp);
+        if (ret)
+                return pcibios_err_to_errno(ret);
+
+        evcc = tmp & PCI_VC_REG1_EVCC; /* extended vc count */
+        ret = pci_read_config_dword(pdev, pos + PCI_VC_PORT_REG2, &tmp);
+        if (ret)
+                return pcibios_err_to_errno(ret);
+
+        if (tmp & PCI_VC_REG2_128_PHASE)
+                phases = 128;
+        else if (tmp & PCI_VC_REG2_64_PHASE)
+                phases = 64;
+        else if (tmp & PCI_VC_REG2_32_PHASE)
+                phases = 32;
+        else
+                phases = 0;
+
+        vc_arb = phases * 4;
+
+        /*
+         * Port arbitration tables are root & switch only;
+         * function arbitration tables are function 0 only.
+         * In either case, we'll never let user write them so
+         * we don't care how big they are
+         */
+        len += (1 + evcc) * PCI_CAP_VC_PER_VC_SIZEOF;
+        if (vc_arb) {
+                len = round_up(len, 16);
+                len += vc_arb / 8;
+        }
+        return len;
+}
+
+static int vfio_cap_len(struct vfio_pci_device *vdev, u8 cap, u8 pos)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        u16 word;
+        u8 byte;
+        int ret;
+
+        switch (cap) {
+        case PCI_CAP_ID_MSI:
+                return vfio_msi_cap_len(vdev, pos);
+        case PCI_CAP_ID_PCIX:
+                ret = pci_read_config_word(pdev, pos + PCI_X_CMD, &word);
+                if (ret)
+                        return pcibios_err_to_errno(ret);
+
+                if (PCI_X_CMD_VERSION(word)) {
+                        vdev->extended_caps = true;
+                        return PCI_CAP_PCIX_SIZEOF_V2;
+                } else
+                        return PCI_CAP_PCIX_SIZEOF_V0;
+        case PCI_CAP_ID_VNDR:
+                /* length follows next field */
+                ret = pci_read_config_byte(pdev, pos + PCI_CAP_FLAGS, &byte);
+                if (ret)
+                        return pcibios_err_to_errno(ret);
+
+                return byte;
+        case PCI_CAP_ID_EXP:
+                /* length based on version */
+                ret = pci_read_config_word(pdev, pos + PCI_EXP_FLAGS, &word);
+                if (ret)
+                        return pcibios_err_to_errno(ret);
+
+                if ((word & PCI_EXP_FLAGS_VERS) == 1)
+                        return PCI_CAP_EXP_ENDPOINT_SIZEOF_V1;
+                else {
+                        vdev->extended_caps = true;
+                        return PCI_CAP_EXP_ENDPOINT_SIZEOF_V2;
+                }
+        case PCI_CAP_ID_HT:
+                ret = pci_read_config_byte(pdev, pos + 3, &byte);
+                if (ret)
+                        return pcibios_err_to_errno(ret);
+
+                return (byte & HT_3BIT_CAP_MASK) ?
+                        HT_CAP_SIZEOF_SHORT : HT_CAP_SIZEOF_LONG;
+        case PCI_CAP_ID_SATA:
+                ret = pci_read_config_byte(pdev, pos + PCI_SATA_REGS, &byte);
+                if (ret)
+                        return pcibios_err_to_errno(ret);
+
+                byte &= PCI_SATA_REGS_MASK;
+                if (byte == PCI_SATA_REGS_INLINE)
+                        return PCI_SATA_SIZEOF_LONG;
+                else
+                        return PCI_SATA_SIZEOF_SHORT;
+        default:
+                pr_warn("%s: %s unknown length for pci cap 0x%x@0x%x\n",
+                        dev_name(&pdev->dev), __func__, cap, pos);
+        }
+
+        return 0;
+}
+
+static int vfio_ext_cap_len(struct vfio_pci_device *vdev, u16 ecap, u16 epos)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        u8 byte;
+        u32 dword;
+        int ret;
+
+        switch (ecap) {
+        case PCI_EXT_CAP_ID_VNDR:
+                ret = pci_read_config_dword(pdev, epos + PCI_VSEC_HDR, &dword);
+                if (ret)
+                        return pcibios_err_to_errno(ret);
+
+                return dword >> PCI_VSEC_HDR_LEN_SHIFT;
+        case PCI_EXT_CAP_ID_VC:
+        case PCI_EXT_CAP_ID_VC9:
+        case PCI_EXT_CAP_ID_MFVC:
+                return vfio_vc_cap_len(vdev, epos);
+        case PCI_EXT_CAP_ID_ACS:
+                ret = pci_read_config_byte(pdev, epos + PCI_ACS_CAP, &byte);
+                if (ret)
+                        return pcibios_err_to_errno(ret);
+
+                if (byte & PCI_ACS_EC) {
+                        int bits;
+
+                        ret = pci_read_config_byte(pdev,
+                                                   epos + PCI_ACS_EGRESS_BITS,
+                                                   &byte);
+                        if (ret)
+                                return pcibios_err_to_errno(ret);
+
+                        bits = byte ? round_up(byte, 32) : 256;
+                        return 8 + (bits / 8);
+                }
+                return 8;
+
+        case PCI_EXT_CAP_ID_REBAR:
+                ret = pci_read_config_byte(pdev, epos + PCI_REBAR_CTRL, &byte);
+                if (ret)
+                        return pcibios_err_to_errno(ret);
+
+                byte &= PCI_REBAR_CTRL_NBAR_MASK;
+                byte >>= PCI_REBAR_CTRL_NBAR_SHIFT;
+
+                return 4 + (byte * 8);
+        case PCI_EXT_CAP_ID_DPA:
+                ret = pci_read_config_byte(pdev, epos + PCI_DPA_CAP, &byte);
+                if (ret)
+                        return pcibios_err_to_errno(ret);
+
+                byte &= PCI_DPA_CAP_SUBSTATE_MASK;
+                byte = round_up(byte + 1, 4);
+                return PCI_DPA_BASE_SIZEOF + byte;
+        case PCI_EXT_CAP_ID_TPH:
+                ret = pci_read_config_dword(pdev, epos + PCI_TPH_CAP, &dword);
+                if (ret)
+                        return pcibios_err_to_errno(ret);
+
+                if ((dword & PCI_TPH_CAP_LOC_MASK) == PCI_TPH_LOC_CAP) {
+                        int sts;
+
+                        sts = byte & PCI_TPH_CAP_ST_MASK;
+                        sts >>= PCI_TPH_CAP_ST_SHIFT;
+                        return PCI_TPH_BASE_SIZEOF + round_up(sts * 2, 4);
+                }
+                return PCI_TPH_BASE_SIZEOF;
+        default:
+                pr_warn("%s: %s unknown length for pci ecap 0x%x@0x%x\n",
+                        dev_name(&pdev->dev), __func__, ecap, epos);
+        }
+
+        return 0;
+}
+
+static int vfio_fill_vconfig_bytes(struct vfio_pci_device *vdev,
+                                   int offset, int size)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        int ret = 0;
+
+        /*
+         * We try to read physical config space in the largest chunks
+         * we can, assuming that all of the fields support dword access.
+         * pci_save_state() makes this same assumption and seems to do ok.
+         */
+        while (size) {
+                int filled;
+
+                if (size >= 4 && !(offset % 4)) {
+                        __le32 *dwordp = (__le32 *)&vdev->vconfig[offset];
+                        u32 dword;
+
+                        ret = pci_read_config_dword(pdev, offset, &dword);
+                        if (ret)
+                                return ret;
+                        *dwordp = cpu_to_le32(dword);
+                        filled = 4;
+                } else if (size >= 2 && !(offset % 2)) {
+                        __le16 *wordp = (__le16 *)&vdev->vconfig[offset];
+                        u16 word;
+
+                        ret = pci_read_config_word(pdev, offset, &word);
+                        if (ret)
+                                return ret;
+                        *wordp = cpu_to_le16(word);
+                        filled = 2;
+                } else {
+                        u8 *byte = &vdev->vconfig[offset];
+                        ret = pci_read_config_byte(pdev, offset, byte);
+                        if (ret)
+                                return ret;
+                        filled = 1;
+                }
+
+                offset += filled;
+                size -= filled;
+        }
+
+        return ret;
+}
+
+static int vfio_cap_init(struct vfio_pci_device *vdev)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        u8 *map = vdev->pci_config_map;
+        u16 status;
+        u8 pos, *prev, cap;
+        int loops, ret, caps = 0;
+
+        /* Any capabilities? */
+        ret = pci_read_config_word(pdev, PCI_STATUS, &status);
+        if (ret)
+                return ret;
+
+        if (!(status & PCI_STATUS_CAP_LIST))
+                return 0; /* Done */
+
+        ret = pci_read_config_byte(pdev, PCI_CAPABILITY_LIST, &pos);
+        if (ret)
+                return ret;
+
+        /* Mark the previous position in case we want to skip a capability */
+        prev = &vdev->vconfig[PCI_CAPABILITY_LIST];
+
+        /* We can bound our loop, capabilities are dword aligned */
+        loops = (PCI_CFG_SPACE_SIZE - PCI_STD_HEADER_SIZEOF) / PCI_CAP_SIZEOF;
+        while (pos && loops--) {
+                u8 next;
+                int i, len = 0;
+
+                ret = pci_read_config_byte(pdev, pos, &cap);
+                if (ret)
+                        return ret;
+
+                ret = pci_read_config_byte(pdev,
+                                           pos + PCI_CAP_LIST_NEXT, &next);
+                if (ret)
+                        return ret;
+
+                if (cap <= PCI_CAP_ID_MAX) {
+                        len = pci_cap_length[cap];
+                        if (len == 0xFF) { /* Variable length */
+                                len = vfio_cap_len(vdev, cap, pos);
+                                if (len < 0)
+                                        return len;
+                        }
+                }
+
+                if (!len) {
+                        pr_info("%s: %s hiding cap 0x%x\n",
+                                __func__, dev_name(&pdev->dev), cap);
+                        *prev = next;
+                        pos = next;
+                        continue;
+                }
+
+                /* Sanity check, do we overlap other capabilities? */
+                for (i = 0; i < len; i += 4) {
+                        if (likely(map[(pos + i) / 4] == PCI_CAP_ID_INVALID))
+                                continue;
+
+                        pr_warn("%s: %s pci config conflict @0x%x, was cap 0x%x now cap 0x%x\n",
+                                __func__, dev_name(&pdev->dev),
+                                pos + i, map[pos + i], cap);
+                }
+
+                memset(map + (pos / 4), cap, len / 4);
+                ret = vfio_fill_vconfig_bytes(vdev, pos, len);
+                if (ret)
+                        return ret;
+
+                prev = &vdev->vconfig[pos + PCI_CAP_LIST_NEXT];
+                pos = next;
+                caps++;
+        }
+
+        /* If we didn't fill any capabilities, clear the status flag */
+        if (!caps) {
+                __le16 *vstatus = (__le16 *)&vdev->vconfig[PCI_STATUS];
+                *vstatus &= ~cpu_to_le16(PCI_STATUS_CAP_LIST);
+        }
+
+        return 0;
+}
+
+static int vfio_ecap_init(struct vfio_pci_device *vdev)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        u8 *map = vdev->pci_config_map;
+        u16 epos;
+        __le32 *prev = NULL;
+        int loops, ret, ecaps = 0;
+
+        if (!vdev->extended_caps)
+                return 0;
+
+        epos = PCI_CFG_SPACE_SIZE;
+
+        loops = (pdev->cfg_size - PCI_CFG_SPACE_SIZE) / PCI_CAP_SIZEOF;
+
+        while (loops-- && epos >= PCI_CFG_SPACE_SIZE) {
+                u32 header;
+                u16 ecap;
+                int i, len = 0;
+                bool hidden = false;
+
+                ret = pci_read_config_dword(pdev, epos, &header);
+                if (ret)
+                        return ret;
+
+                ecap = PCI_EXT_CAP_ID(header);
+
+                if (ecap <= PCI_EXT_CAP_ID_MAX) {
+                        len = pci_ext_cap_length[ecap];
+                        if (len == 0xFF) {
+                                len = vfio_ext_cap_len(vdev, ecap, epos);
+                                if (len < 0)
+                                        return ret;
+                        }
+                }
+
+                if (!len) {
+                        pr_info("%s: %s hiding ecap 0x%x@0x%x\n",
+                                __func__, dev_name(&pdev->dev), ecap, epos);
+
+                        /* If not the first in the chain, we can skip over it */
+                        if (prev) {
+                                u32 val = epos = PCI_EXT_CAP_NEXT(header);
+                                *prev &= cpu_to_le32(~(0xffcU << 20));
+                                *prev |= cpu_to_le32(val << 20);
+                                continue;
+                        }
+
+                        /*
+                         * Otherwise, fill in a placeholder, the direct
+                         * readfn will virtualize this automatically
+                         */
+                        len = PCI_CAP_SIZEOF;
+                        hidden = true;
+                }
+
+                for (i = 0; i < len; i += 4) {
+                        if (likely(map[(epos + i) / 4] == PCI_CAP_ID_INVALID))
+                                continue;
+
+                        pr_warn("%s: %s pci config conflict @0x%x, was ecap 0x%x now ecap 0x%x\n",
+                                __func__, dev_name(&pdev->dev),
+                                epos + i, map[epos + i], ecap);
+                }
+
+                /*
+                 * Even though ecap is 2 bytes, we're currently a long way
+                 * from exceeding 1 byte capabilities.  If we ever make it
+                 * up to 0xFF we'll need to up this to a two-byte, byte map.
+                 */
+                BUILD_BUG_ON(PCI_EXT_CAP_ID_MAX >= PCI_CAP_ID_INVALID);
+
+                memset(map + (epos / 4), ecap, len / 4);
+                ret = vfio_fill_vconfig_bytes(vdev, epos, len);
+                if (ret)
+                        return ret;
+
+                /*
+                 * If we're just using this capability to anchor the list,
+                 * hide the real ID.  Only count real ecaps.  XXX PCI spec
+                 * indicates to use cap id = 0, version = 0, next = 0 if
+                 * ecaps are absent, hope users check all the way to next.
+                 */
+                if (hidden)
+                        *(__le32 *)&vdev->vconfig[epos] &=
+                                cpu_to_le32((0xffcU << 20));
+                else
+                        ecaps++;
+
+                prev = (__le32 *)&vdev->vconfig[epos];
+                epos = PCI_EXT_CAP_NEXT(header);
+        }
+
+        if (!ecaps)
+                *(u32 *)&vdev->vconfig[PCI_CFG_SPACE_SIZE] = 0;
+
+        return 0;
+}
+
+/*
+ * For each device we allocate a pci_config_map that indicates the
+ * capability occupying each dword and thus the struct perm_bits we
+ * use for read and write.  We also allocate a virtualized config
+ * space which tracks reads and writes to bits that we emulate for
+ * the user.  Initial values filled from device.
+ *
+ * Using shared stuct perm_bits between all vfio-pci devices saves
+ * us from allocating cfg_size buffers for virt and write for every
+ * device.  We could remove vconfig and allocate individual buffers
+ * for each area requring emulated bits, but the array of pointers
+ * would be comparable in size (at least for standard config space).
+ */
+int vfio_config_init(struct vfio_pci_device *vdev)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        u8 *map, *vconfig;
+        int ret;
+
+        /*
+         * Config space, caps and ecaps are all dword aligned, so we can
+         * use one byte per dword to record the type.
+         */
+        map = kmalloc(pdev->cfg_size / 4, GFP_KERNEL);
+        if (!map)
+                return -ENOMEM;
+
+        vconfig = kmalloc(pdev->cfg_size, GFP_KERNEL);
+        if (!vconfig) {
+                kfree(map);
+                return -ENOMEM;
+        }
+
+        vdev->pci_config_map = map;
+        vdev->vconfig = vconfig;
+
+        memset(map, PCI_CAP_ID_BASIC, PCI_STD_HEADER_SIZEOF / 4);
+        memset(map + (PCI_STD_HEADER_SIZEOF / 4), PCI_CAP_ID_INVALID,
+               (pdev->cfg_size - PCI_STD_HEADER_SIZEOF) / 4);
+
+        ret = vfio_fill_vconfig_bytes(vdev, 0, PCI_STD_HEADER_SIZEOF);
+        if (ret)
+                goto out;
+
+        vdev->bardirty = true;
+
+        /*
+         * XXX can we just pci_load_saved_state/pci_restore_state?
+         * may need to rebuild vconfig after that
+         */
+
+        /* For restore after reset */
+        vdev->rbar[0] = le32_to_cpu(*(__le32 *)&vconfig[PCI_BASE_ADDRESS_0]);
+        vdev->rbar[1] = le32_to_cpu(*(__le32 *)&vconfig[PCI_BASE_ADDRESS_1]);
+        vdev->rbar[2] = le32_to_cpu(*(__le32 *)&vconfig[PCI_BASE_ADDRESS_2]);
+        vdev->rbar[3] = le32_to_cpu(*(__le32 *)&vconfig[PCI_BASE_ADDRESS_3]);
+        vdev->rbar[4] = le32_to_cpu(*(__le32 *)&vconfig[PCI_BASE_ADDRESS_4]);
+        vdev->rbar[5] = le32_to_cpu(*(__le32 *)&vconfig[PCI_BASE_ADDRESS_5]);
+        vdev->rbar[6] = le32_to_cpu(*(__le32 *)&vconfig[PCI_ROM_ADDRESS]);
+
+        if (pdev->is_virtfn) {
+                *(__le16 *)&vconfig[PCI_VENDOR_ID] = cpu_to_le16(pdev->vendor);
+                *(__le16 *)&vconfig[PCI_DEVICE_ID] = cpu_to_le16(pdev->device);
+        }
+
+        ret = vfio_cap_init(vdev);
+        if (ret)
+                goto out;
+
+        ret = vfio_ecap_init(vdev);
+        if (ret)
+                goto out;
+
+        return 0;
+
+out:
+        kfree(map);
+        vdev->pci_config_map = NULL;
+        kfree(vconfig);
+        vdev->vconfig = NULL;
+        return pcibios_err_to_errno(ret);
+}
+
+void vfio_config_free(struct vfio_pci_device *vdev)
+{
+        kfree(vdev->vconfig);
+        vdev->vconfig = NULL;
+        kfree(vdev->pci_config_map);
+        vdev->pci_config_map = NULL;
+        kfree(vdev->msi_perm);
+        vdev->msi_perm = NULL;
+}
+
+static ssize_t vfio_config_do_rw(struct vfio_pci_device *vdev, char __user *buf,
+                                 size_t count, loff_t *ppos, bool iswrite)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        struct perm_bits *perm;
+        __le32 val = 0;
+        int cap_start = 0, offset;
+        u8 cap_id;
+        ssize_t ret = count;
+
+        if (*ppos < 0 || *ppos + count > pdev->cfg_size)
+                return -EFAULT;
+
+        /*
+         * gcc can't seem to figure out we're a static function, only called
+         * with count of 1/2/4 and hits copy_from_user_overflow without this.
+         */
+        if (count > sizeof(val))
+                return -EINVAL;
+
+        cap_id = vdev->pci_config_map[*ppos / 4];
+
+        if (cap_id == PCI_CAP_ID_INVALID) {
+                if (iswrite)
+                        return ret; /* drop */
+
+                /*
+                 * Per PCI spec 3.0, section 6.1, reads from reserved and
+                 * unimplemented registers return 0
+                 */
+                if (copy_to_user(buf, &val, count))
+                        return -EFAULT;
+
+                return ret;
+        }
+
+        /*
+         * All capabilities are minimum 4 bytes and aligned on dword
+         * boundaries.  Since we don't support unaligned accesses, we're
+         * only ever accessing a single capability.
+         */
+        if (*ppos >= PCI_CFG_SPACE_SIZE) {
+                WARN_ON(cap_id > PCI_EXT_CAP_ID_MAX);
+
+                perm = &ecap_perms[cap_id];
+                cap_start = vfio_find_cap_start(vdev, *ppos);
+
+        } else {
+                WARN_ON(cap_id > PCI_CAP_ID_MAX);
+
+                perm = &cap_perms[cap_id];
+
+                if (cap_id == PCI_CAP_ID_MSI)
+                        perm = vdev->msi_perm;
+
+                if (cap_id > PCI_CAP_ID_BASIC)
+                        cap_start = vfio_find_cap_start(vdev, *ppos);
+        }
+
+        WARN_ON(!cap_start && cap_id != PCI_CAP_ID_BASIC);
+        WARN_ON(cap_start > *ppos);
+
+        offset = *ppos - cap_start;
+
+        if (iswrite) {
+                if (!perm->writefn)
+                        return ret;
+
+                if (copy_from_user(&val, buf, count))
+                        return -EFAULT;
+
+                ret = perm->writefn(vdev, *ppos, count, perm, offset, val);
+        } else {
+                if (perm->readfn) {
+                        ret = perm->readfn(vdev, *ppos, count,
+                                           perm, offset, &val);
+                        if (ret < 0)
+                                return ret;
+                }
+
+                if (copy_to_user(buf, &val, count))
+                        return -EFAULT;
+        }
+
+        return ret;
+}
+
+ssize_t vfio_pci_config_readwrite(struct vfio_pci_device *vdev,
+                                  char __user *buf, size_t count,
+                                  loff_t *ppos, bool iswrite)
+{
+        size_t done = 0;
+        int ret = 0;
+        loff_t pos = *ppos;
+
+        pos &= VFIO_PCI_OFFSET_MASK;
+
+        /*
+         * We want to both keep the access size the caller users as well as
+         * support reading large chunks of config space in a single call.
+         * PCI doesn't support unaligned accesses, so we can safely break
+         * those apart.
+         */
+        while (count) {
+                if (count >= 4 && !(pos % 4))
+                        ret = vfio_config_do_rw(vdev, buf, 4, &pos, iswrite);
+                else if (count >= 2 && !(pos % 2))
+                        ret = vfio_config_do_rw(vdev, buf, 2, &pos, iswrite);
+                else
+                        ret = vfio_config_do_rw(vdev, buf, 1, &pos, iswrite);
+
+                if (ret < 0)
+                        return ret;
+
+                count -= ret;
+                done += ret;
+                buf += ret;
+                pos += ret;
+        }
+
+        *ppos += done;
+
+        return done;
+}
diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c
new file mode 100644
index 000000000000..211a4920b88a
--- /dev/null
+++ b/drivers/vfio/pci/vfio_pci_intrs.c
@@ -0,0 +1,740 @@
+/*
+ * VFIO PCI interrupt handling
+ *
+ * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
+ *     Author: Alex Williamson <alex.williamson@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Derived from original vfio:
+ * Copyright 2010 Cisco Systems, Inc.  All rights reserved.
+ * Author: Tom Lyon, pugs@cisco.com
+ */
+
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/eventfd.h>
+#include <linux/pci.h>
+#include <linux/file.h>
+#include <linux/poll.h>
+#include <linux/vfio.h>
+#include <linux/wait.h>
+#include <linux/workqueue.h>
+
+#include "vfio_pci_private.h"
+
+/*
+ * IRQfd - generic
+ */
+struct virqfd {
+        struct vfio_pci_device  *vdev;
+        struct eventfd_ctx      *eventfd;
+        int                     (*handler)(struct vfio_pci_device *, void *);
+        void                    (*thread)(struct vfio_pci_device *, void *);
+        void                    *data;
+        struct work_struct      inject;
+        wait_queue_t            wait;
+        poll_table              pt;
+        struct work_struct      shutdown;
+        struct virqfd           **pvirqfd;
+};
+
+static struct workqueue_struct *vfio_irqfd_cleanup_wq;
+
+int __init vfio_pci_virqfd_init(void)
+{
+        vfio_irqfd_cleanup_wq =
+                create_singlethread_workqueue("vfio-irqfd-cleanup");
+        if (!vfio_irqfd_cleanup_wq)
+                return -ENOMEM;
+
+        return 0;
+}
+
+void vfio_pci_virqfd_exit(void)
+{
+        destroy_workqueue(vfio_irqfd_cleanup_wq);
+}
+
+static void virqfd_deactivate(struct virqfd *virqfd)
+{
+        queue_work(vfio_irqfd_cleanup_wq, &virqfd->shutdown);
+}
+
+static int virqfd_wakeup(wait_queue_t *wait, unsigned mode, int sync, void *key)
+{
+        struct virqfd *virqfd = container_of(wait, struct virqfd, wait);
+        unsigned long flags = (unsigned long)key;
+
+        if (flags & POLLIN) {
+                /* An event has been signaled, call function */
+                if ((!virqfd->handler ||
+                     virqfd->handler(virqfd->vdev, virqfd->data)) &&
+                    virqfd->thread)
+                        schedule_work(&virqfd->inject);
+        }
+
+        if (flags & POLLHUP)
+                /* The eventfd is closing, detach from VFIO */
+                virqfd_deactivate(virqfd);
+
+        return 0;
+}
+
+static void virqfd_ptable_queue_proc(struct file *file,
+                                     wait_queue_head_t *wqh, poll_table *pt)
+{
+        struct virqfd *virqfd = container_of(pt, struct virqfd, pt);
+        add_wait_queue(wqh, &virqfd->wait);
+}
+
+static void virqfd_shutdown(struct work_struct *work)
+{
+        struct virqfd *virqfd = container_of(work, struct virqfd, shutdown);
+        struct virqfd **pvirqfd = virqfd->pvirqfd;
+        u64 cnt;
+
+        eventfd_ctx_remove_wait_queue(virqfd->eventfd, &virqfd->wait, &cnt);
+        flush_work(&virqfd->inject);
+        eventfd_ctx_put(virqfd->eventfd);
+
+        kfree(virqfd);
+        *pvirqfd = NULL;
+}
+
+static void virqfd_inject(struct work_struct *work)
+{
+        struct virqfd *virqfd = container_of(work, struct virqfd, inject);
+        if (virqfd->thread)
+                virqfd->thread(virqfd->vdev, virqfd->data);
+}
+
+static int virqfd_enable(struct vfio_pci_device *vdev,
+                         int (*handler)(struct vfio_pci_device *, void *),
+                         void (*thread)(struct vfio_pci_device *, void *),
+                         void *data, struct virqfd **pvirqfd, int fd)
+{
+        struct file *file = NULL;
+        struct eventfd_ctx *ctx = NULL;
+        struct virqfd *virqfd;
+        int ret = 0;
+        unsigned int events;
+
+        if (*pvirqfd)
+                return -EBUSY;
+
+        virqfd = kzalloc(sizeof(*virqfd), GFP_KERNEL);
+        if (!virqfd)
+                return -ENOMEM;
+
+        virqfd->pvirqfd = pvirqfd;
+        *pvirqfd = virqfd;
+        virqfd->vdev = vdev;
+        virqfd->handler = handler;
+        virqfd->thread = thread;
+        virqfd->data = data;
+
+        INIT_WORK(&virqfd->shutdown, virqfd_shutdown);
+        INIT_WORK(&virqfd->inject, virqfd_inject);
+
+        file = eventfd_fget(fd);
+        if (IS_ERR(file)) {
+                ret = PTR_ERR(file);
+                goto fail;
+        }
+
+        ctx = eventfd_ctx_fileget(file);
+        if (IS_ERR(ctx)) {
+                ret = PTR_ERR(ctx);
+                goto fail;
+        }
+
+        virqfd->eventfd = ctx;
+
+        /*
+         * Install our own custom wake-up handling so we are notified via
+         * a callback whenever someone signals the underlying eventfd.
+         */
+        init_waitqueue_func_entry(&virqfd->wait, virqfd_wakeup);
+        init_poll_funcptr(&virqfd->pt, virqfd_ptable_queue_proc);
+
+        events = file->f_op->poll(file, &virqfd->pt);
+
+        /*
+         * Check if there was an event already pending on the eventfd
+         * before we registered and trigger it as if we didn't miss it.
+         */
+        if (events & POLLIN) {
+                if ((!handler || handler(vdev, data)) && thread)
+                        schedule_work(&virqfd->inject);
+        }
+
+        /*
+         * Do not drop the file until the irqfd is fully initialized,
+         * otherwise we might race against the POLLHUP.
+         */
+        fput(file);
+
+        return 0;
+
+fail:
+        if (ctx && !IS_ERR(ctx))
+                eventfd_ctx_put(ctx);
+
+        if (file && !IS_ERR(file))
+                fput(file);
+
+        kfree(virqfd);
+        *pvirqfd = NULL;
+
+        return ret;
+}
+
+static void virqfd_disable(struct virqfd *virqfd)
+{
+        if (!virqfd)
+                return;
+
+        virqfd_deactivate(virqfd);
+
+        /* Block until we know all outstanding shutdown jobs have completed. */
+        flush_workqueue(vfio_irqfd_cleanup_wq);
+}
+
+/*
+ * INTx
+ */
+static void vfio_send_intx_eventfd(struct vfio_pci_device *vdev, void *unused)
+{
+        if (likely(is_intx(vdev) && !vdev->virq_disabled))
+                eventfd_signal(vdev->ctx[0].trigger, 1);
+}
+
+void vfio_pci_intx_mask(struct vfio_pci_device *vdev)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        unsigned long flags;
+
+        spin_lock_irqsave(&vdev->irqlock, flags);
+
+        /*
+         * Masking can come from interrupt, ioctl, or config space
+         * via INTx disable.  The latter means this can get called
+         * even when not using intx delivery.  In this case, just
+         * try to have the physical bit follow the virtual bit.
+         */
+        if (unlikely(!is_intx(vdev))) {
+                if (vdev->pci_2_3)
+                        pci_intx(pdev, 0);
+        } else if (!vdev->ctx[0].masked) {
+                /*
+                 * Can't use check_and_mask here because we always want to
+                 * mask, not just when something is pending.
+                 */
+                if (vdev->pci_2_3)
+                        pci_intx(pdev, 0);
+                else
+                        disable_irq_nosync(pdev->irq);
+
+                vdev->ctx[0].masked = true;
+        }
+
+        spin_unlock_irqrestore(&vdev->irqlock, flags);
+}
+
+/*
+ * If this is triggered by an eventfd, we can't call eventfd_signal
+ * or else we'll deadlock on the eventfd wait queue.  Return >0 when
+ * a signal is necessary, which can then be handled via a work queue
+ * or directly depending on the caller.
+ */
+int vfio_pci_intx_unmask_handler(struct vfio_pci_device *vdev, void *unused)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        unsigned long flags;
+        int ret = 0;
+
+        spin_lock_irqsave(&vdev->irqlock, flags);
+
+        /*
+         * Unmasking comes from ioctl or config, so again, have the
+         * physical bit follow the virtual even when not using INTx.
+         */
+        if (unlikely(!is_intx(vdev))) {
+                if (vdev->pci_2_3)
+                        pci_intx(pdev, 1);
+        } else if (vdev->ctx[0].masked && !vdev->virq_disabled) {
+                /*
+                 * A pending interrupt here would immediately trigger,
+                 * but we can avoid that overhead by just re-sending
+                 * the interrupt to the user.
+                 */
+                if (vdev->pci_2_3) {
+                        if (!pci_check_and_unmask_intx(pdev))
+                                ret = 1;
+                } else
+                        enable_irq(pdev->irq);
+
+                vdev->ctx[0].masked = (ret > 0);
+        }
+
+        spin_unlock_irqrestore(&vdev->irqlock, flags);
+
+        return ret;
+}
+
+void vfio_pci_intx_unmask(struct vfio_pci_device *vdev)
+{
+        if (vfio_pci_intx_unmask_handler(vdev, NULL) > 0)
+                vfio_send_intx_eventfd(vdev, NULL);
+}
+
+static irqreturn_t vfio_intx_handler(int irq, void *dev_id)
+{
+        struct vfio_pci_device *vdev = dev_id;
+        unsigned long flags;
+        int ret = IRQ_NONE;
+
+        spin_lock_irqsave(&vdev->irqlock, flags);
+
+        if (!vdev->pci_2_3) {
+                disable_irq_nosync(vdev->pdev->irq);
+                vdev->ctx[0].masked = true;
+                ret = IRQ_HANDLED;
+        } else if (!vdev->ctx[0].masked &&  /* may be shared */
+                   pci_check_and_mask_intx(vdev->pdev)) {
+                vdev->ctx[0].masked = true;
+                ret = IRQ_HANDLED;
+        }
+
+        spin_unlock_irqrestore(&vdev->irqlock, flags);
+
+        if (ret == IRQ_HANDLED)
+                vfio_send_intx_eventfd(vdev, NULL);
+
+        return ret;
+}
+
+static int vfio_intx_enable(struct vfio_pci_device *vdev)
+{
+        if (!is_irq_none(vdev))
+                return -EINVAL;
+
+        if (!vdev->pdev->irq)
+                return -ENODEV;
+
+        vdev->ctx = kzalloc(sizeof(struct vfio_pci_irq_ctx), GFP_KERNEL);
+        if (!vdev->ctx)
+                return -ENOMEM;
+
+        vdev->num_ctx = 1;
+        vdev->irq_type = VFIO_PCI_INTX_IRQ_INDEX;
+
+        return 0;
+}
+
+static int vfio_intx_set_signal(struct vfio_pci_device *vdev, int fd)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        unsigned long irqflags = IRQF_SHARED;
+        struct eventfd_ctx *trigger;
+        unsigned long flags;
+        int ret;
+
+        if (vdev->ctx[0].trigger) {
+                free_irq(pdev->irq, vdev);
+                kfree(vdev->ctx[0].name);
+                eventfd_ctx_put(vdev->ctx[0].trigger);
+                vdev->ctx[0].trigger = NULL;
+        }
+
+        if (fd < 0) /* Disable only */
+                return 0;
+
+        vdev->ctx[0].name = kasprintf(GFP_KERNEL, "vfio-intx(%s)",
+                                      pci_name(pdev));
+        if (!vdev->ctx[0].name)
+                return -ENOMEM;
+
+        trigger = eventfd_ctx_fdget(fd);
+        if (IS_ERR(trigger)) {
+                kfree(vdev->ctx[0].name);
+                return PTR_ERR(trigger);
+        }
+
+        if (!vdev->pci_2_3)
+                irqflags = 0;
+
+        ret = request_irq(pdev->irq, vfio_intx_handler,
+                          irqflags, vdev->ctx[0].name, vdev);
+        if (ret) {
+                kfree(vdev->ctx[0].name);
+                eventfd_ctx_put(trigger);
+                return ret;
+        }
+
+        vdev->ctx[0].trigger = trigger;
+
+        /*
+         * INTx disable will stick across the new irq setup,
+         * disable_irq won't.
+         */
+        spin_lock_irqsave(&vdev->irqlock, flags);
+        if (!vdev->pci_2_3 && (vdev->ctx[0].masked || vdev->virq_disabled))
+                disable_irq_nosync(pdev->irq);
+        spin_unlock_irqrestore(&vdev->irqlock, flags);
+
+        return 0;
+}
+
+static void vfio_intx_disable(struct vfio_pci_device *vdev)
+{
+        vfio_intx_set_signal(vdev, -1);
+        virqfd_disable(vdev->ctx[0].unmask);
+        virqfd_disable(vdev->ctx[0].mask);
+        vdev->irq_type = VFIO_PCI_NUM_IRQS;
+        vdev->num_ctx = 0;
+        kfree(vdev->ctx);
+}
+
+/*
+ * MSI/MSI-X
+ */
+static irqreturn_t vfio_msihandler(int irq, void *arg)
+{
+        struct eventfd_ctx *trigger = arg;
+
+        eventfd_signal(trigger, 1);
+        return IRQ_HANDLED;
+}
+
+static int vfio_msi_enable(struct vfio_pci_device *vdev, int nvec, bool msix)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        int ret;
+
+        if (!is_irq_none(vdev))
+                return -EINVAL;
+
+        vdev->ctx = kzalloc(nvec * sizeof(struct vfio_pci_irq_ctx), GFP_KERNEL);
+        if (!vdev->ctx)
+                return -ENOMEM;
+
+        if (msix) {
+                int i;
+
+                vdev->msix = kzalloc(nvec * sizeof(struct msix_entry),
+                                     GFP_KERNEL);
+                if (!vdev->msix) {
+                        kfree(vdev->ctx);
+                        return -ENOMEM;
+                }
+
+                for (i = 0; i < nvec; i++)
+                        vdev->msix[i].entry = i;
+
+                ret = pci_enable_msix(pdev, vdev->msix, nvec);
+                if (ret) {
+                        kfree(vdev->msix);
+                        kfree(vdev->ctx);
+                        return ret;
+                }
+        } else {
+                ret = pci_enable_msi_block(pdev, nvec);
+                if (ret) {
+                        kfree(vdev->ctx);
+                        return ret;
+                }
+        }
+
+        vdev->num_ctx = nvec;
+        vdev->irq_type = msix ? VFIO_PCI_MSIX_IRQ_INDEX :
+                                VFIO_PCI_MSI_IRQ_INDEX;
+
+        if (!msix) {
+                /*
+                 * Compute the virtual hardware field for max msi vectors -
+                 * it is the log base 2 of the number of vectors.
+                 */
+                vdev->msi_qmax = fls(nvec * 2 - 1) - 1;
+        }
+
+        return 0;
+}
+
+static int vfio_msi_set_vector_signal(struct vfio_pci_device *vdev,
+                                      int vector, int fd, bool msix)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        int irq = msix ? vdev->msix[vector].vector : pdev->irq + vector;
+        char *name = msix ? "vfio-msix" : "vfio-msi";
+        struct eventfd_ctx *trigger;
+        int ret;
+
+        if (vector >= vdev->num_ctx)
+                return -EINVAL;
+
+        if (vdev->ctx[vector].trigger) {
+                free_irq(irq, vdev->ctx[vector].trigger);
+                kfree(vdev->ctx[vector].name);
+                eventfd_ctx_put(vdev->ctx[vector].trigger);
+                vdev->ctx[vector].trigger = NULL;
+        }
+
+        if (fd < 0)
+                return 0;
+
+        vdev->ctx[vector].name = kasprintf(GFP_KERNEL, "%s[%d](%s)",
+                                           name, vector, pci_name(pdev));
+        if (!vdev->ctx[vector].name)
+                return -ENOMEM;
+
+        trigger = eventfd_ctx_fdget(fd);
+        if (IS_ERR(trigger)) {
+                kfree(vdev->ctx[vector].name);
+                return PTR_ERR(trigger);
+        }
+
+        ret = request_irq(irq, vfio_msihandler, 0,
+                          vdev->ctx[vector].name, trigger);
+        if (ret) {
+                kfree(vdev->ctx[vector].name);
+                eventfd_ctx_put(trigger);
+                return ret;
+        }
+
+        vdev->ctx[vector].trigger = trigger;
+
+        return 0;
+}
+
+static int vfio_msi_set_block(struct vfio_pci_device *vdev, unsigned start,
+                              unsigned count, int32_t *fds, bool msix)
+{
+        int i, j, ret = 0;
+
+        if (start + count > vdev->num_ctx)
+                return -EINVAL;
+
+        for (i = 0, j = start; i < count && !ret; i++, j++) {
+                int fd = fds ? fds[i] : -1;
+                ret = vfio_msi_set_vector_signal(vdev, j, fd, msix);
+        }
+
+        if (ret) {
+                for (--j; j >= start; j--)
+                        vfio_msi_set_vector_signal(vdev, j, -1, msix);
+        }
+
+        return ret;
+}
+
+static void vfio_msi_disable(struct vfio_pci_device *vdev, bool msix)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        int i;
+
+        vfio_msi_set_block(vdev, 0, vdev->num_ctx, NULL, msix);
+
+        for (i = 0; i < vdev->num_ctx; i++) {
+                virqfd_disable(vdev->ctx[i].unmask);
+                virqfd_disable(vdev->ctx[i].mask);
+        }
+
+        if (msix) {
+                pci_disable_msix(vdev->pdev);
+                kfree(vdev->msix);
+        } else
+                pci_disable_msi(pdev);
+
+        vdev->irq_type = VFIO_PCI_NUM_IRQS;
+        vdev->num_ctx = 0;
+        kfree(vdev->ctx);
+}
+
+/*
+ * IOCTL support
+ */
+static int vfio_pci_set_intx_unmask(struct vfio_pci_device *vdev,
+                                    unsigned index, unsigned start,
+                                    unsigned count, uint32_t flags, void *data)
+{
+        if (!is_intx(vdev) || start != 0 || count != 1)
+                return -EINVAL;
+
+        if (flags & VFIO_IRQ_SET_DATA_NONE) {
+                vfio_pci_intx_unmask(vdev);
+        } else if (flags & VFIO_IRQ_SET_DATA_BOOL) {
+                uint8_t unmask = *(uint8_t *)data;
+                if (unmask)
+                        vfio_pci_intx_unmask(vdev);
+        } else if (flags & VFIO_IRQ_SET_DATA_EVENTFD) {
+                int32_t fd = *(int32_t *)data;
+                if (fd >= 0)
+                        return virqfd_enable(vdev, vfio_pci_intx_unmask_handler,
+                                             vfio_send_intx_eventfd, NULL,
+                                             &vdev->ctx[0].unmask, fd);
+
+                virqfd_disable(vdev->ctx[0].unmask);
+        }
+
+        return 0;
+}
+
+static int vfio_pci_set_intx_mask(struct vfio_pci_device *vdev,
+                                  unsigned index, unsigned start,
+                                  unsigned count, uint32_t flags, void *data)
+{
+        if (!is_intx(vdev) || start != 0 || count != 1)
+                return -EINVAL;
+
+        if (flags & VFIO_IRQ_SET_DATA_NONE) {
+                vfio_pci_intx_mask(vdev);
+        } else if (flags & VFIO_IRQ_SET_DATA_BOOL) {
+                uint8_t mask = *(uint8_t *)data;
+                if (mask)
+                        vfio_pci_intx_mask(vdev);
+        } else if (flags & VFIO_IRQ_SET_DATA_EVENTFD) {
+                return -ENOTTY; /* XXX implement me */
+        }
+
+        return 0;
+}
+
+static int vfio_pci_set_intx_trigger(struct vfio_pci_device *vdev,
+                                     unsigned index, unsigned start,
+                                     unsigned count, uint32_t flags, void *data)
+{
+        if (is_intx(vdev) && !count && (flags & VFIO_IRQ_SET_DATA_NONE)) {
+                vfio_intx_disable(vdev);
+                return 0;
+        }
+
+        if (!(is_intx(vdev) || is_irq_none(vdev)) || start != 0 || count != 1)
+                return -EINVAL;
+
+        if (flags & VFIO_IRQ_SET_DATA_EVENTFD) {
+                int32_t fd = *(int32_t *)data;
+                int ret;
+
+                if (is_intx(vdev))
+                        return vfio_intx_set_signal(vdev, fd);
+
+                ret = vfio_intx_enable(vdev);
+                if (ret)
+                        return ret;
+
+                ret = vfio_intx_set_signal(vdev, fd);
+                if (ret)
+                        vfio_intx_disable(vdev);
+
+                return ret;
+        }
+
+        if (!is_intx(vdev))
+                return -EINVAL;
+
+        if (flags & VFIO_IRQ_SET_DATA_NONE) {
+                vfio_send_intx_eventfd(vdev, NULL);
+        } else if (flags & VFIO_IRQ_SET_DATA_BOOL) {
+                uint8_t trigger = *(uint8_t *)data;
+                if (trigger)
+                        vfio_send_intx_eventfd(vdev, NULL);
+        }
+        return 0;
+}
+
+static int vfio_pci_set_msi_trigger(struct vfio_pci_device *vdev,
+                                    unsigned index, unsigned start,
+                                    unsigned count, uint32_t flags, void *data)
+{
+        int i;
+        bool msix = (index == VFIO_PCI_MSIX_IRQ_INDEX) ? true : false;
+
+        if (irq_is(vdev, index) && !count && (flags & VFIO_IRQ_SET_DATA_NONE)) {
+                vfio_msi_disable(vdev, msix);
+                return 0;
+        }
+
+        if (!(irq_is(vdev, index) || is_irq_none(vdev)))
+                return -EINVAL;
+
+        if (flags & VFIO_IRQ_SET_DATA_EVENTFD) {
+                int32_t *fds = data;
+                int ret;
+
+                if (vdev->irq_type == index)
+                        return vfio_msi_set_block(vdev, start, count,
+                                                  fds, msix);
+
+                ret = vfio_msi_enable(vdev, start + count, msix);
+                if (ret)
+                        return ret;
+
+                ret = vfio_msi_set_block(vdev, start, count, fds, msix);
+                if (ret)
+                        vfio_msi_disable(vdev, msix);
+
+                return ret;
+        }
+
+        if (!irq_is(vdev, index) || start + count > vdev->num_ctx)
+                return -EINVAL;
+
+        for (i = start; i < start + count; i++) {
+                if (!vdev->ctx[i].trigger)
+                        continue;
+                if (flags & VFIO_IRQ_SET_DATA_NONE) {
+                        eventfd_signal(vdev->ctx[i].trigger, 1);
+                } else if (flags & VFIO_IRQ_SET_DATA_BOOL) {
+                        uint8_t *bools = data;
+                        if (bools[i - start])
+                                eventfd_signal(vdev->ctx[i].trigger, 1);
+                }
+        }
+        return 0;
+}
+
+int vfio_pci_set_irqs_ioctl(struct vfio_pci_device *vdev, uint32_t flags,
+                            unsigned index, unsigned start, unsigned count,
+                            void *data)
+{
+        int (*func)(struct vfio_pci_device *vdev, unsigned index,
+                    unsigned start, unsigned count, uint32_t flags,
+                    void *data) = NULL;
+
+        switch (index) {
+        case VFIO_PCI_INTX_IRQ_INDEX:
+                switch (flags & VFIO_IRQ_SET_ACTION_TYPE_MASK) {
+                case VFIO_IRQ_SET_ACTION_MASK:
+                        func = vfio_pci_set_intx_mask;
+                        break;
+                case VFIO_IRQ_SET_ACTION_UNMASK:
+                        func = vfio_pci_set_intx_unmask;
+                        break;
+                case VFIO_IRQ_SET_ACTION_TRIGGER:
+                        func = vfio_pci_set_intx_trigger;
+                        break;
+                }
+                break;
+        case VFIO_PCI_MSI_IRQ_INDEX:
+        case VFIO_PCI_MSIX_IRQ_INDEX:
+                switch (flags & VFIO_IRQ_SET_ACTION_TYPE_MASK) {
+                case VFIO_IRQ_SET_ACTION_MASK:
+                case VFIO_IRQ_SET_ACTION_UNMASK:
+                        /* XXX Need masking support exported */
+                        break;
+                case VFIO_IRQ_SET_ACTION_TRIGGER:
+                        func = vfio_pci_set_msi_trigger;
+                        break;
+                }
+                break;
+        }
+
+        if (!func)
+                return -ENOTTY;
+
+        return func(vdev, index, start, count, flags, data);
+}
diff --git a/drivers/vfio/pci/vfio_pci_private.h b/drivers/vfio/pci/vfio_pci_private.h
new file mode 100644
index 000000000000..611827cba8cd
--- /dev/null
+++ b/drivers/vfio/pci/vfio_pci_private.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
+ *     Author: Alex Williamson <alex.williamson@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Derived from original vfio:
+ * Copyright 2010 Cisco Systems, Inc.  All rights reserved.
+ * Author: Tom Lyon, pugs@cisco.com
+ */
+
+#include <linux/mutex.h>
+#include <linux/pci.h>
+
+#ifndef VFIO_PCI_PRIVATE_H
+#define VFIO_PCI_PRIVATE_H
+
+#define VFIO_PCI_OFFSET_SHIFT   40
+
+#define VFIO_PCI_OFFSET_TO_INDEX(off)   (off >> VFIO_PCI_OFFSET_SHIFT)
+#define VFIO_PCI_INDEX_TO_OFFSET(index) ((u64)(index) << VFIO_PCI_OFFSET_SHIFT)
+#define VFIO_PCI_OFFSET_MASK    (((u64)(1) << VFIO_PCI_OFFSET_SHIFT) - 1)
+
+struct vfio_pci_irq_ctx {
+        struct eventfd_ctx      *trigger;
+        struct virqfd           *unmask;
+        struct virqfd           *mask;
+        char                    *name;
+        bool                    masked;
+};
+
+struct vfio_pci_device {
+        struct pci_dev          *pdev;
+        void __iomem            *barmap[PCI_STD_RESOURCE_END + 1];
+        u8                      *pci_config_map;
+        u8                      *vconfig;
+        struct perm_bits        *msi_perm;
+        spinlock_t              irqlock;
+        struct mutex            igate;
+        struct msix_entry       *msix;
+        struct vfio_pci_irq_ctx *ctx;
+        int                     num_ctx;
+        int                     irq_type;
+        u8                      msi_qmax;
+        u8                      msix_bar;
+        u16                     msix_size;
+        u32                     msix_offset;
+        u32                     rbar[7];
+        bool                    pci_2_3;
+        bool                    virq_disabled;
+        bool                    reset_works;
+        bool                    extended_caps;
+        bool                    bardirty;
+        struct pci_saved_state  *pci_saved_state;
+        atomic_t                refcnt;
+};
+
+#define is_intx(vdev) (vdev->irq_type == VFIO_PCI_INTX_IRQ_INDEX)
+#define is_msi(vdev) (vdev->irq_type == VFIO_PCI_MSI_IRQ_INDEX)
+#define is_msix(vdev) (vdev->irq_type == VFIO_PCI_MSIX_IRQ_INDEX)
+#define is_irq_none(vdev) (!(is_intx(vdev) || is_msi(vdev) || is_msix(vdev)))
+#define irq_is(vdev, type) (vdev->irq_type == type)
+
+extern void vfio_pci_intx_mask(struct vfio_pci_device *vdev);
+extern void vfio_pci_intx_unmask(struct vfio_pci_device *vdev);
+
+extern int vfio_pci_set_irqs_ioctl(struct vfio_pci_device *vdev,
+                                   uint32_t flags, unsigned index,
+                                   unsigned start, unsigned count, void *data);
+
+extern ssize_t vfio_pci_config_readwrite(struct vfio_pci_device *vdev,
+                                         char __user *buf, size_t count,
+                                         loff_t *ppos, bool iswrite);
+extern ssize_t vfio_pci_mem_readwrite(struct vfio_pci_device *vdev,
+                                      char __user *buf, size_t count,
+                                      loff_t *ppos, bool iswrite);
+extern ssize_t vfio_pci_io_readwrite(struct vfio_pci_device *vdev,
+                                     char __user *buf, size_t count,
+                                     loff_t *ppos, bool iswrite);
+
+extern int vfio_pci_init_perm_bits(void);
+extern void vfio_pci_uninit_perm_bits(void);
+
+extern int vfio_pci_virqfd_init(void);
+extern void vfio_pci_virqfd_exit(void);
+
+extern int vfio_config_init(struct vfio_pci_device *vdev);
+extern void vfio_config_free(struct vfio_pci_device *vdev);
+#endif /* VFIO_PCI_PRIVATE_H */
diff --git a/drivers/vfio/pci/vfio_pci_rdwr.c b/drivers/vfio/pci/vfio_pci_rdwr.c
new file mode 100644
index 000000000000..4362d9e7baa3
--- /dev/null
+++ b/drivers/vfio/pci/vfio_pci_rdwr.c
@@ -0,0 +1,269 @@
+/*
+ * VFIO PCI I/O Port & MMIO access
+ *
+ * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
+ *     Author: Alex Williamson <alex.williamson@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Derived from original vfio:
+ * Copyright 2010 Cisco Systems, Inc.  All rights reserved.
+ * Author: Tom Lyon, pugs@cisco.com
+ */
+
+#include <linux/fs.h>
+#include <linux/pci.h>
+#include <linux/uaccess.h>
+#include <linux/io.h>
+
+#include "vfio_pci_private.h"
+
+/* I/O Port BAR access */
+ssize_t vfio_pci_io_readwrite(struct vfio_pci_device *vdev, char __user *buf,
+                              size_t count, loff_t *ppos, bool iswrite)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        loff_t pos = *ppos & VFIO_PCI_OFFSET_MASK;
+        int bar = VFIO_PCI_OFFSET_TO_INDEX(*ppos);
+        void __iomem *io;
+        size_t done = 0;
+
+        if (!pci_resource_start(pdev, bar))
+                return -EINVAL;
+
+        if (pos + count > pci_resource_len(pdev, bar))
+                return -EINVAL;
+
+        if (!vdev->barmap[bar]) {
+                int ret;
+
+                ret = pci_request_selected_regions(pdev, 1 << bar, "vfio");
+                if (ret)
+                        return ret;
+
+                vdev->barmap[bar] = pci_iomap(pdev, bar, 0);
+
+                if (!vdev->barmap[bar]) {
+                        pci_release_selected_regions(pdev, 1 << bar);
+                        return -EINVAL;
+                }
+        }
+
+        io = vdev->barmap[bar];
+
+        while (count) {
+                int filled;
+
+                if (count >= 3 && !(pos % 4)) {
+                        __le32 val;
+
+                        if (iswrite) {
+                                if (copy_from_user(&val, buf, 4))
+                                        return -EFAULT;
+
+                                iowrite32(le32_to_cpu(val), io + pos);
+                        } else {
+                                val = cpu_to_le32(ioread32(io + pos));
+
+                                if (copy_to_user(buf, &val, 4))
+                                        return -EFAULT;
+                        }
+
+                        filled = 4;
+
+                } else if ((pos % 2) == 0 && count >= 2) {
+                        __le16 val;
+
+                        if (iswrite) {
+                                if (copy_from_user(&val, buf, 2))
+                                        return -EFAULT;
+
+                                iowrite16(le16_to_cpu(val), io + pos);
+                        } else {
+                                val = cpu_to_le16(ioread16(io + pos));
+
+                                if (copy_to_user(buf, &val, 2))
+                                        return -EFAULT;
+                        }
+
+                        filled = 2;
+                } else {
+                        u8 val;
+
+                        if (iswrite) {
+                                if (copy_from_user(&val, buf, 1))
+                                        return -EFAULT;
+
+                                iowrite8(val, io + pos);
+                        } else {
+                                val = ioread8(io + pos);
+
+                                if (copy_to_user(buf, &val, 1))
+                                        return -EFAULT;
+                        }
+
+                        filled = 1;
+                }
+
+                count -= filled;
+                done += filled;
+                buf += filled;
+                pos += filled;
+        }
+
+        *ppos += done;
+
+        return done;
+}
+
+/*
+ * MMIO BAR access
+ * We handle two excluded ranges here as well, if the user tries to read
+ * the ROM beyond what PCI tells us is available or the MSI-X table region,
+ * we return 0xFF and writes are dropped.
+ */
+ssize_t vfio_pci_mem_readwrite(struct vfio_pci_device *vdev, char __user *buf,
+                               size_t count, loff_t *ppos, bool iswrite)
+{
+        struct pci_dev *pdev = vdev->pdev;
+        loff_t pos = *ppos & VFIO_PCI_OFFSET_MASK;
+        int bar = VFIO_PCI_OFFSET_TO_INDEX(*ppos);
+        void __iomem *io;
+        resource_size_t end;
+        size_t done = 0;
+        size_t x_start = 0, x_end = 0; /* excluded range */
+
+        if (!pci_resource_start(pdev, bar))
+                return -EINVAL;
+
+        end = pci_resource_len(pdev, bar);
+
+        if (pos > end)
+                return -EINVAL;
+
+        if (pos == end)
+                return 0;
+
+        if (pos + count > end)
+                count = end - pos;
+
+        if (bar == PCI_ROM_RESOURCE) {
+                io = pci_map_rom(pdev, &x_start);
+                x_end = end;
+        } else {
+                if (!vdev->barmap[bar]) {
+                        int ret;
+
+                        ret = pci_request_selected_regions(pdev, 1 << bar,
+                                                           "vfio");
+                        if (ret)
+                                return ret;
+
+                        vdev->barmap[bar] = pci_iomap(pdev, bar, 0);
+
+                        if (!vdev->barmap[bar]) {
+                                pci_release_selected_regions(pdev, 1 << bar);
+                                return -EINVAL;
+                        }
+                }
+
+                io = vdev->barmap[bar];
+
+                if (bar == vdev->msix_bar) {
+                        x_start = vdev->msix_offset;
+                        x_end = vdev->msix_offset + vdev->msix_size;
+                }
+        }
+
+        if (!io)
+                return -EINVAL;
+
+        while (count) {
+                size_t fillable, filled;
+
+                if (pos < x_start)
+                        fillable = x_start - pos;
+                else if (pos >= x_end)
+                        fillable = end - pos;
+                else
+                        fillable = 0;
+
+                if (fillable >= 4 && !(pos % 4) && (count >= 4)) {
+                        __le32 val;
+
+                        if (iswrite) {
+                                if (copy_from_user(&val, buf, 4))
+                                        goto out;
+
+                                iowrite32(le32_to_cpu(val), io + pos);
+                        } else {
+                                val = cpu_to_le32(ioread32(io + pos));
+
+                                if (copy_to_user(buf, &val, 4))
+                                        goto out;
+                        }
+
+                        filled = 4;
+                } else if (fillable >= 2 && !(pos % 2) && (count >= 2)) {
+                        __le16 val;
+
+                        if (iswrite) {
+                                if (copy_from_user(&val, buf, 2))
+                                        goto out;
+
+                                iowrite16(le16_to_cpu(val), io + pos);
+                        } else {
+                                val = cpu_to_le16(ioread16(io + pos));
+
+                                if (copy_to_user(buf, &val, 2))
+                                        goto out;
+                        }
+
+                        filled = 2;
+                } else if (fillable) {
+                        u8 val;
+
+                        if (iswrite) {
+                                if (copy_from_user(&val, buf, 1))
+                                        goto out;
+
+                                iowrite8(val, io + pos);
+                        } else {
+                                val = ioread8(io + pos);
+
+                                if (copy_to_user(buf, &val, 1))
+                                        goto out;
+                        }
+
+                        filled = 1;
+                } else {
+                        /* Drop writes, fill reads with FF */
+                        if (!iswrite) {
+                                char val = 0xFF;
+                                size_t i;
+
+                                for (i = 0; i < x_end - pos; i++) {
+                                        if (put_user(val, buf + i))
+                                                goto out;
+                                }
+                        }
+
+                        filled = x_end - pos;
+                }
+
+                count -= filled;
+                done += filled;
+                buf += filled;
+                pos += filled;
+        }
+
+        *ppos += done;
+
+out:
+        if (bar == PCI_ROM_RESOURCE)
+                pci_unmap_rom(pdev, io);
+
+        return count ? -EFAULT : done;
+}
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
new file mode 100644
index 000000000000..9591e2b509d7
--- /dev/null
+++ b/drivers/vfio/vfio.c
@@ -0,0 +1,1420 @@
+/*
+ * VFIO core
+ *
+ * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
+ *     Author: Alex Williamson <alex.williamson@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Derived from original vfio:
+ * Copyright 2010 Cisco Systems, Inc.  All rights reserved.
+ * Author: Tom Lyon, pugs@cisco.com
+ */
+
+#include <linux/cdev.h>
+#include <linux/compat.h>
+#include <linux/device.h>
+#include <linux/file.h>
+#include <linux/anon_inodes.h>
+#include <linux/fs.h>
+#include <linux/idr.h>
+#include <linux/iommu.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/uaccess.h>
+#include <linux/vfio.h>
+#include <linux/wait.h>
+
+#define DRIVER_VERSION  "0.3"
+#define DRIVER_AUTHOR   "Alex Williamson <alex.williamson@redhat.com>"
+#define DRIVER_DESC     "VFIO - User Level meta-driver"
+
+static struct vfio {
+        struct class                    *class;
+        struct list_head                iommu_drivers_list;
+        struct mutex                    iommu_drivers_lock;
+        struct list_head                group_list;
+        struct idr                      group_idr;
+        struct mutex                    group_lock;
+        struct cdev                     group_cdev;
+        struct device                   *dev;
+        dev_t                           devt;
+        struct cdev                     cdev;
+        wait_queue_head_t               release_q;
+} vfio;
+
+struct vfio_iommu_driver {
+        const struct vfio_iommu_driver_ops      *ops;
+        struct list_head                        vfio_next;
+};
+
+struct vfio_container {
+        struct kref                     kref;
+        struct list_head                group_list;
+        struct mutex                    group_lock;
+        struct vfio_iommu_driver        *iommu_driver;
+        void                            *iommu_data;
+};
+
+struct vfio_group {
+        struct kref                     kref;
+        int                             minor;
+        atomic_t                        container_users;
+        struct iommu_group              *iommu_group;
+        struct vfio_container           *container;
+        struct list_head                device_list;
+        struct mutex                    device_lock;
+        struct device                   *dev;
+        struct notifier_block           nb;
+        struct list_head                vfio_next;
+        struct list_head                container_next;
+};
+
+struct vfio_device {
+        struct kref                     kref;
+        struct device                   *dev;
+        const struct vfio_device_ops    *ops;
+        struct vfio_group               *group;
+        struct list_head                group_next;
+        void                            *device_data;
+};
+
+/**
+ * IOMMU driver registration
+ */
+int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops)
+{
+        struct vfio_iommu_driver *driver, *tmp;
+
+        driver = kzalloc(sizeof(*driver), GFP_KERNEL);
+        if (!driver)
+                return -ENOMEM;
+
+        driver->ops = ops;
+
+        mutex_lock(&vfio.iommu_drivers_lock);
+
+        /* Check for duplicates */
+        list_for_each_entry(tmp, &vfio.iommu_drivers_list, vfio_next) {
+                if (tmp->ops == ops) {
+                        mutex_unlock(&vfio.iommu_drivers_lock);
+                        kfree(driver);
+                        return -EINVAL;
+                }
+        }
+
+        list_add(&driver->vfio_next, &vfio.iommu_drivers_list);
+
+        mutex_unlock(&vfio.iommu_drivers_lock);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(vfio_register_iommu_driver);
+
+void vfio_unregister_iommu_driver(const struct vfio_iommu_driver_ops *ops)
+{
+        struct vfio_iommu_driver *driver;
+
+        mutex_lock(&vfio.iommu_drivers_lock);
+        list_for_each_entry(driver, &vfio.iommu_drivers_list, vfio_next) {
+                if (driver->ops == ops) {
+                        list_del(&driver->vfio_next);
+                        mutex_unlock(&vfio.iommu_drivers_lock);
+                        kfree(driver);
+                        return;
+                }
+        }
+        mutex_unlock(&vfio.iommu_drivers_lock);
+}
+EXPORT_SYMBOL_GPL(vfio_unregister_iommu_driver);
+
+/**
+ * Group minor allocation/free - both called with vfio.group_lock held
+ */
+static int vfio_alloc_group_minor(struct vfio_group *group)
+{
+        int ret, minor;
+
+again:
+        if (unlikely(idr_pre_get(&vfio.group_idr, GFP_KERNEL) == 0))
+                return -ENOMEM;
+
+        /* index 0 is used by /dev/vfio/vfio */
+        ret = idr_get_new_above(&vfio.group_idr, group, 1, &minor);
+        if (ret == -EAGAIN)
+                goto again;
+        if (ret || minor > MINORMASK) {
+                if (minor > MINORMASK)
+                        idr_remove(&vfio.group_idr, minor);
+                return -ENOSPC;
+        }
+
+        return minor;
+}
+
+static void vfio_free_group_minor(int minor)
+{
+        idr_remove(&vfio.group_idr, minor);
+}
+
+static int vfio_iommu_group_notifier(struct notifier_block *nb,
+                                     unsigned long action, void *data);
+static void vfio_group_get(struct vfio_group *group);
+
+/**
+ * Container objects - containers are created when /dev/vfio/vfio is
+ * opened, but their lifecycle extends until the last user is done, so
+ * it's freed via kref.  Must support container/group/device being
+ * closed in any order.
+ */
+static void vfio_container_get(struct vfio_container *container)
+{
+        kref_get(&container->kref);
+}
+
+static void vfio_container_release(struct kref *kref)
+{
+        struct vfio_container *container;
+        container = container_of(kref, struct vfio_container, kref);
+
+        kfree(container);
+}
+
+static void vfio_container_put(struct vfio_container *container)
+{
+        kref_put(&container->kref, vfio_container_release);
+}
+
+/**
+ * Group objects - create, release, get, put, search
+ */
+static struct vfio_group *vfio_create_group(struct iommu_group *iommu_group)
+{
+        struct vfio_group *group, *tmp;
+        struct device *dev;
+        int ret, minor;
+
+        group = kzalloc(sizeof(*group), GFP_KERNEL);
+        if (!group)
+                return ERR_PTR(-ENOMEM);
+
+        kref_init(&group->kref);
+        INIT_LIST_HEAD(&group->device_list);
+        mutex_init(&group->device_lock);
+        atomic_set(&group->container_users, 0);
+        group->iommu_group = iommu_group;
+
+        group->nb.notifier_call = vfio_iommu_group_notifier;
+
+        /*
+         * blocking notifiers acquire a rwsem around registering and hold
+         * it around callback.  Therefore, need to register outside of
+         * vfio.group_lock to avoid A-B/B-A contention.  Our callback won't
+         * do anything unless it can find the group in vfio.group_list, so
+         * no harm in registering early.
+         */
+        ret = iommu_group_register_notifier(iommu_group, &group->nb);
+        if (ret) {
+                kfree(group);
+                return ERR_PTR(ret);
+        }
+
+        mutex_lock(&vfio.group_lock);
+
+        minor = vfio_alloc_group_minor(group);
+        if (minor < 0) {
+                mutex_unlock(&vfio.group_lock);
+                kfree(group);
+                return ERR_PTR(minor);
+        }
+
+        /* Did we race creating this group? */
+        list_for_each_entry(tmp, &vfio.group_list, vfio_next) {
+                if (tmp->iommu_group == iommu_group) {
+                        vfio_group_get(tmp);
+                        vfio_free_group_minor(minor);
+                        mutex_unlock(&vfio.group_lock);
+                        kfree(group);
+                        return tmp;
+                }
+        }
+
+        dev = device_create(vfio.class, NULL, MKDEV(MAJOR(vfio.devt), minor),
+                            group, "%d", iommu_group_id(iommu_group));
+        if (IS_ERR(dev)) {
+                vfio_free_group_minor(minor);
+                mutex_unlock(&vfio.group_lock);
+                kfree(group);
+                return (struct vfio_group *)dev; /* ERR_PTR */
+        }
+
+        group->minor = minor;
+        group->dev = dev;
+
+        list_add(&group->vfio_next, &vfio.group_list);
+
+        mutex_unlock(&vfio.group_lock);
+
+        return group;
+}
+
+static void vfio_group_release(struct kref *kref)
+{
+        struct vfio_group *group = container_of(kref, struct vfio_group, kref);
+
+        WARN_ON(!list_empty(&group->device_list));
+
+        device_destroy(vfio.class, MKDEV(MAJOR(vfio.devt), group->minor));
+        list_del(&group->vfio_next);
+        vfio_free_group_minor(group->minor);
+
+        mutex_unlock(&vfio.group_lock);
+
+        /*
+         * Unregister outside of lock.  A spurious callback is harmless now
+         * that the group is no longer in vfio.group_list.
+         */
+        iommu_group_unregister_notifier(group->iommu_group, &group->nb);
+
+        kfree(group);
+}
+
+static void vfio_group_put(struct vfio_group *group)
+{
+        mutex_lock(&vfio.group_lock);
+        /*
+         * Release needs to unlock to unregister the notifier, so only
+         * unlock if not released.
+         */
+        if (!kref_put(&group->kref, vfio_group_release))
+                mutex_unlock(&vfio.group_lock);
+}
+
+/* Assume group_lock or group reference is held */
+static void vfio_group_get(struct vfio_group *group)
+{
+        kref_get(&group->kref);
+}
+
+/*
+ * Not really a try as we will sleep for mutex, but we need to make
+ * sure the group pointer is valid under lock and get a reference.
+ */
+static struct vfio_group *vfio_group_try_get(struct vfio_group *group)
+{
+        struct vfio_group *target = group;
+
+        mutex_lock(&vfio.group_lock);
+        list_for_each_entry(group, &vfio.group_list, vfio_next) {
+                if (group == target) {
+                        vfio_group_get(group);
+                        mutex_unlock(&vfio.group_lock);
+                        return group;
+                }
+        }
+        mutex_unlock(&vfio.group_lock);
+
+        return NULL;
+}
+
+static
+struct vfio_group *vfio_group_get_from_iommu(struct iommu_group *iommu_group)
+{
+        struct vfio_group *group;
+
+        mutex_lock(&vfio.group_lock);
+        list_for_each_entry(group, &vfio.group_list, vfio_next) {
+                if (group->iommu_group == iommu_group) {
+                        vfio_group_get(group);
+                        mutex_unlock(&vfio.group_lock);
+                        return group;
+                }
+        }
+        mutex_unlock(&vfio.group_lock);
+
+        return NULL;
+}
+
+static struct vfio_group *vfio_group_get_from_minor(int minor)
+{
+        struct vfio_group *group;
+
+        mutex_lock(&vfio.group_lock);
+        group = idr_find(&vfio.group_idr, minor);
+        if (!group) {
+                mutex_unlock(&vfio.group_lock);
+                return NULL;
+        }
+        vfio_group_get(group);
+        mutex_unlock(&vfio.group_lock);
+
+        return group;
+}
+
+/**
+ * Device objects - create, release, get, put, search
+ */
+static
+struct vfio_device *vfio_group_create_device(struct vfio_group *group,
+                                             struct device *dev,
+                                             const struct vfio_device_ops *ops,
+                                             void *device_data)
+{
+        struct vfio_device *device;
+        int ret;
+
+        device = kzalloc(sizeof(*device), GFP_KERNEL);
+        if (!device)
+                return ERR_PTR(-ENOMEM);
+
+        kref_init(&device->kref);
+        device->dev = dev;
+        device->group = group;
+        device->ops = ops;
+        device->device_data = device_data;
+
+        ret = dev_set_drvdata(dev, device);
+        if (ret) {
+                kfree(device);
+                return ERR_PTR(ret);
+        }
+
+        /* No need to get group_lock, caller has group reference */
+        vfio_group_get(group);
+
+        mutex_lock(&group->device_lock);
+        list_add(&device->group_next, &group->device_list);
+        mutex_unlock(&group->device_lock);
+
+        return device;
+}
+
+static void vfio_device_release(struct kref *kref)
+{
+        struct vfio_device *device = container_of(kref,
+                                                  struct vfio_device, kref);
+        struct vfio_group *group = device->group;
+
+        mutex_lock(&group->device_lock);
+        list_del(&device->group_next);
+        mutex_unlock(&group->device_lock);
+
+        dev_set_drvdata(device->dev, NULL);
+
+        kfree(device);
+
+        /* vfio_del_group_dev may be waiting for this device */
+        wake_up(&vfio.release_q);
+}
+
+/* Device reference always implies a group reference */
+static void vfio_device_put(struct vfio_device *device)
+{
+        kref_put(&device->kref, vfio_device_release);
+        vfio_group_put(device->group);
+}
+
+static void vfio_device_get(struct vfio_device *device)
+{
+        vfio_group_get(device->group);
+        kref_get(&device->kref);
+}
+
+static struct vfio_device *vfio_group_get_device(struct vfio_group *group,
+                                                 struct device *dev)
+{
+        struct vfio_device *device;
+
+        mutex_lock(&group->device_lock);
+        list_for_each_entry(device, &group->device_list, group_next) {
+                if (device->dev == dev) {
+                        vfio_device_get(device);
+                        mutex_unlock(&group->device_lock);
+                        return device;
+                }
+        }
+        mutex_unlock(&group->device_lock);
+        return NULL;
+}
+
+/*
+ * Whitelist some drivers that we know are safe (no dma) or just sit on
+ * a device.  It's not always practical to leave a device within a group
+ * driverless as it could get re-bound to something unsafe.
+ */
+static const char * const vfio_driver_whitelist[] = { "pci-stub" };
+
+static bool vfio_whitelisted_driver(struct device_driver *drv)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(vfio_driver_whitelist); i++) {
+                if (!strcmp(drv->name, vfio_driver_whitelist[i]))
+                        return true;
+        }
+
+        return false;
+}
+
+/*
+ * A vfio group is viable for use by userspace if all devices are either
+ * driver-less or bound to a vfio or whitelisted driver.  We test the
+ * latter by the existence of a struct vfio_device matching the dev.
+ */
+static int vfio_dev_viable(struct device *dev, void *data)
+{
+        struct vfio_group *group = data;
+        struct vfio_device *device;
+
+        if (!dev->driver || vfio_whitelisted_driver(dev->driver))
+                return 0;
+
+        device = vfio_group_get_device(group, dev);
+        if (device) {
+                vfio_device_put(device);
+                return 0;
+        }
+
+        return -EINVAL;
+}
+
+/**
+ * Async device support
+ */
+static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
+{
+        struct vfio_device *device;
+
+        /* Do we already know about it?  We shouldn't */
+        device = vfio_group_get_device(group, dev);
+        if (WARN_ON_ONCE(device)) {
+                vfio_device_put(device);
+                return 0;
+        }
+
+        /* Nothing to do for idle groups */
+        if (!atomic_read(&group->container_users))
+                return 0;
+
+        /* TODO Prevent device auto probing */
+        WARN("Device %s added to live group %d!\n", dev_name(dev),
+             iommu_group_id(group->iommu_group));
+
+        return 0;
+}
+
+static int vfio_group_nb_del_dev(struct vfio_group *group, struct device *dev)
+{
+        struct vfio_device *device;
+
+        /*
+         * Expect to fall out here.  If a device was in use, it would
+         * have been bound to a vfio sub-driver, which would have blocked
+         * in .remove at vfio_del_group_dev.  Sanity check that we no
+         * longer track the device, so it's safe to remove.
+         */
+        device = vfio_group_get_device(group, dev);
+        if (likely(!device))
+                return 0;
+
+        WARN("Device %s removed from live group %d!\n", dev_name(dev),
+             iommu_group_id(group->iommu_group));
+
+        vfio_device_put(device);
+        return 0;
+}
+
+static int vfio_group_nb_verify(struct vfio_group *group, struct device *dev)
+{
+        /* We don't care what happens when the group isn't in use */
+        if (!atomic_read(&group->container_users))
+                return 0;
+
+        return vfio_dev_viable(dev, group);
+}
+
+static int vfio_iommu_group_notifier(struct notifier_block *nb,
+                                     unsigned long action, void *data)
+{
+        struct vfio_group *group = container_of(nb, struct vfio_group, nb);
+        struct device *dev = data;
+
+        /*
+         * Need to go through a group_lock lookup to get a reference or
+         * we risk racing a group being removed.  Leave a WARN_ON for
+         * debuging, but if the group no longer exists, a spurious notify
+         * is harmless.
+         */
+        group = vfio_group_try_get(group);
+        if (WARN_ON(!group))
+                return NOTIFY_OK;
+
+        switch (action) {
+        case IOMMU_GROUP_NOTIFY_ADD_DEVICE:
+                vfio_group_nb_add_dev(group, dev);
+                break;
+        case IOMMU_GROUP_NOTIFY_DEL_DEVICE:
+                vfio_group_nb_del_dev(group, dev);
+                break;
+        case IOMMU_GROUP_NOTIFY_BIND_DRIVER:
+                pr_debug("%s: Device %s, group %d binding to driver\n",
+                         __func__, dev_name(dev),
+                         iommu_group_id(group->iommu_group));
+                break;
+        case IOMMU_GROUP_NOTIFY_BOUND_DRIVER:
+                pr_debug("%s: Device %s, group %d bound to driver %s\n",
+                         __func__, dev_name(dev),
+                         iommu_group_id(group->iommu_group), dev->driver->name);
+                BUG_ON(vfio_group_nb_verify(group, dev));
+                break;
+        case IOMMU_GROUP_NOTIFY_UNBIND_DRIVER:
+                pr_debug("%s: Device %s, group %d unbinding from driver %s\n",
+                         __func__, dev_name(dev),
+                         iommu_group_id(group->iommu_group), dev->driver->name);
+                break;
+        case IOMMU_GROUP_NOTIFY_UNBOUND_DRIVER:
+                pr_debug("%s: Device %s, group %d unbound from driver\n",
+                         __func__, dev_name(dev),
+                         iommu_group_id(group->iommu_group));
+                /*
+                 * XXX An unbound device in a live group is ok, but we'd
+                 * really like to avoid the above BUG_ON by preventing other
+                 * drivers from binding to it.  Once that occurs, we have to
+                 * stop the system to maintain isolation.  At a minimum, we'd
+                 * want a toggle to disable driver auto probe for this device.
+                 */
+                break;
+        }
+
+        vfio_group_put(group);
+        return NOTIFY_OK;
+}
+
+/**
+ * VFIO driver API
+ */
+int vfio_add_group_dev(struct device *dev,
+                       const struct vfio_device_ops *ops, void *device_data)
+{
+        struct iommu_group *iommu_group;
+        struct vfio_group *group;
+        struct vfio_device *device;
+
+        iommu_group = iommu_group_get(dev);
+        if (!iommu_group)
+                return -EINVAL;
+
+        group = vfio_group_get_from_iommu(iommu_group);
+        if (!group) {
+                group = vfio_create_group(iommu_group);
+                if (IS_ERR(group)) {
+                        iommu_group_put(iommu_group);
+                        return PTR_ERR(group);
+                }
+        }
+
+        device = vfio_group_get_device(group, dev);
+        if (device) {
+                WARN(1, "Device %s already exists on group %d\n",
+                     dev_name(dev), iommu_group_id(iommu_group));
+                vfio_device_put(device);
+                vfio_group_put(group);
+                iommu_group_put(iommu_group);
+                return -EBUSY;
+        }
+
+        device = vfio_group_create_device(group, dev, ops, device_data);
+        if (IS_ERR(device)) {
+                vfio_group_put(group);
+                iommu_group_put(iommu_group);
+                return PTR_ERR(device);
+        }
+
+        /*
+         * Added device holds reference to iommu_group and vfio_device
+         * (which in turn holds reference to vfio_group).  Drop extra
+         * group reference used while acquiring device.
+         */
+        vfio_group_put(group);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(vfio_add_group_dev);
+
+/* Test whether a struct device is present in our tracking */
+static bool vfio_dev_present(struct device *dev)
+{
+        struct iommu_group *iommu_group;
+        struct vfio_group *group;
+        struct vfio_device *device;
+
+        iommu_group = iommu_group_get(dev);
+        if (!iommu_group)
+                return false;
+
+        group = vfio_group_get_from_iommu(iommu_group);
+        if (!group) {
+                iommu_group_put(iommu_group);
+                return false;
+        }
+
+        device = vfio_group_get_device(group, dev);
+        if (!device) {
+                vfio_group_put(group);
+                iommu_group_put(iommu_group);
+                return false;
+        }
+
+        vfio_device_put(device);
+        vfio_group_put(group);
+        iommu_group_put(iommu_group);
+        return true;
+}
+
+/*
+ * Decrement the device reference count and wait for the device to be
+ * removed.  Open file descriptors for the device... */
+void *vfio_del_group_dev(struct device *dev)
+{
+        struct vfio_device *device = dev_get_drvdata(dev);
+        struct vfio_group *group = device->group;
+        struct iommu_group *iommu_group = group->iommu_group;
+        void *device_data = device->device_data;
+
+        vfio_device_put(device);
+
+        /* TODO send a signal to encourage this to be released */
+        wait_event(vfio.release_q, !vfio_dev_present(dev));
+
+        iommu_group_put(iommu_group);
+
+        return device_data;
+}
+EXPORT_SYMBOL_GPL(vfio_del_group_dev);
+
+/**
+ * VFIO base fd, /dev/vfio/vfio
+ */
+static long vfio_ioctl_check_extension(struct vfio_container *container,
+                                       unsigned long arg)
+{
+        struct vfio_iommu_driver *driver = container->iommu_driver;
+        long ret = 0;
+
+        switch (arg) {
+                /* No base extensions yet */
+        default:
+                /*
+                 * If no driver is set, poll all registered drivers for
+                 * extensions and return the first positive result.  If
+                 * a driver is already set, further queries will be passed
+                 * only to that driver.
+                 */
+                if (!driver) {
+                        mutex_lock(&vfio.iommu_drivers_lock);
+                        list_for_each_entry(driver, &vfio.iommu_drivers_list,
+                                            vfio_next) {
+                                if (!try_module_get(driver->ops->owner))
+                                        continue;
+
+                                ret = driver->ops->ioctl(NULL,
+                                                         VFIO_CHECK_EXTENSION,
+                                                         arg);
+                                module_put(driver->ops->owner);
+                                if (ret > 0)
+                                        break;
+                        }
+                        mutex_unlock(&vfio.iommu_drivers_lock);
+                } else
+                        ret = driver->ops->ioctl(container->iommu_data,
+                                                 VFIO_CHECK_EXTENSION, arg);
+        }
+
+        return ret;
+}
+
+/* hold container->group_lock */
+static int __vfio_container_attach_groups(struct vfio_container *container,
+                                          struct vfio_iommu_driver *driver,
+                                          void *data)
+{
+        struct vfio_group *group;
+        int ret = -ENODEV;
+
+        list_for_each_entry(group, &container->group_list, container_next) {
+                ret = driver->ops->attach_group(data, group->iommu_group);
+                if (ret)
+                        goto unwind;
+        }
+
+        return ret;
+
+unwind:
+        list_for_each_entry_continue_reverse(group, &container->group_list,
+                                             container_next) {
+                driver->ops->detach_group(data, group->iommu_group);
+        }
+
+        return ret;
+}
+
+static long vfio_ioctl_set_iommu(struct vfio_container *container,
+                                 unsigned long arg)
+{
+        struct vfio_iommu_driver *driver;
+        long ret = -ENODEV;
+
+        mutex_lock(&container->group_lock);
+
+        /*
+         * The container is designed to be an unprivileged interface while
+         * the group can be assigned to specific users.  Therefore, only by
+         * adding a group to a container does the user get the privilege of
+         * enabling the iommu, which may allocate finite resources.  There
+         * is no unset_iommu, but by removing all the groups from a container,
+         * the container is deprivileged and returns to an unset state.
+         */
+        if (list_empty(&container->group_list) || container->iommu_driver) {
+                mutex_unlock(&container->group_lock);
+                return -EINVAL;
+        }
+
+        mutex_lock(&vfio.iommu_drivers_lock);
+        list_for_each_entry(driver, &vfio.iommu_drivers_list, vfio_next) {
+                void *data;
+
+                if (!try_module_get(driver->ops->owner))
+                        continue;
+
+                /*
+                 * The arg magic for SET_IOMMU is the same as CHECK_EXTENSION,
+                 * so test which iommu driver reported support for this
+                 * extension and call open on them.  We also pass them the
+                 * magic, allowing a single driver to support multiple
+                 * interfaces if they'd like.
+                 */
+                if (driver->ops->ioctl(NULL, VFIO_CHECK_EXTENSION, arg) <= 0) {
+                        module_put(driver->ops->owner);
+                        continue;
+                }
+
+                /* module reference holds the driver we're working on */
+                mutex_unlock(&vfio.iommu_drivers_lock);
+
+                data = driver->ops->open(arg);
+                if (IS_ERR(data)) {
+                        ret = PTR_ERR(data);
+                        module_put(driver->ops->owner);
+                        goto skip_drivers_unlock;
+                }
+
+                ret = __vfio_container_attach_groups(container, driver, data);
+                if (!ret) {
+                        container->iommu_driver = driver;
+                        container->iommu_data = data;
+                } else {
+                        driver->ops->release(data);
+                        module_put(driver->ops->owner);
+                }
+
+                goto skip_drivers_unlock;
+        }
+
+        mutex_unlock(&vfio.iommu_drivers_lock);
+skip_drivers_unlock:
+        mutex_unlock(&container->group_lock);
+
+        return ret;
+}
+
+static long vfio_fops_unl_ioctl(struct file *filep,
+                                unsigned int cmd, unsigned long arg)
+{
+        struct vfio_container *container = filep->private_data;
+        struct vfio_iommu_driver *driver;
+        void *data;
+        long ret = -EINVAL;
+
+        if (!container)
+                return ret;
+
+        driver = container->iommu_driver;
+        data = container->iommu_data;
+
+        switch (cmd) {
+        case VFIO_GET_API_VERSION:
+                ret = VFIO_API_VERSION;
+                break;
+        case VFIO_CHECK_EXTENSION:
+                ret = vfio_ioctl_check_extension(container, arg);
+                break;
+        case VFIO_SET_IOMMU:
+                ret = vfio_ioctl_set_iommu(container, arg);
+                break;
+        default:
+                if (driver) /* passthrough all unrecognized ioctls */
+                        ret = driver->ops->ioctl(data, cmd, arg);
+        }
+
+        return ret;
+}
+
+#ifdef CONFIG_COMPAT
+static long vfio_fops_compat_ioctl(struct file *filep,
+                                   unsigned int cmd, unsigned long arg)
+{
+        arg = (unsigned long)compat_ptr(arg);
+        return vfio_fops_unl_ioctl(filep, cmd, arg);
+}
+#endif  /* CONFIG_COMPAT */
+
+static int vfio_fops_open(struct inode *inode, struct file *filep)
+{
+        struct vfio_container *container;
+
+        container = kzalloc(sizeof(*container), GFP_KERNEL);
+        if (!container)
+                return -ENOMEM;
+
+        INIT_LIST_HEAD(&container->group_list);
+        mutex_init(&container->group_lock);
+        kref_init(&container->kref);
+
+        filep->private_data = container;
+
+        return 0;
+}
+
+static int vfio_fops_release(struct inode *inode, struct file *filep)
+{
+        struct vfio_container *container = filep->private_data;
+
+        filep->private_data = NULL;
+
+        vfio_container_put(container);
+
+        return 0;
+}
+
+/*
+ * Once an iommu driver is set, we optionally pass read/write/mmap
+ * on to the driver, allowing management interfaces beyond ioctl.
+ */
+static ssize_t vfio_fops_read(struct file *filep, char __user *buf,
+                              size_t count, loff_t *ppos)
+{
+        struct vfio_container *container = filep->private_data;
+        struct vfio_iommu_driver *driver = container->iommu_driver;
+
+        if (unlikely(!driver || !driver->ops->read))
+                return -EINVAL;
+
+        return driver->ops->read(container->iommu_data, buf, count, ppos);
+}
+
+static ssize_t vfio_fops_write(struct file *filep, const char __user *buf,
+                               size_t count, loff_t *ppos)
+{
+        struct vfio_container *container = filep->private_data;
+        struct vfio_iommu_driver *driver = container->iommu_driver;
+
+        if (unlikely(!driver || !driver->ops->write))
+                return -EINVAL;
+
+        return driver->ops->write(container->iommu_data, buf, count, ppos);
+}
+
+static int vfio_fops_mmap(struct file *filep, struct vm_area_struct *vma)
+{
+        struct vfio_container *container = filep->private_data;
+        struct vfio_iommu_driver *driver = container->iommu_driver;
+
+        if (unlikely(!driver || !driver->ops->mmap))
+                return -EINVAL;
+
+        return driver->ops->mmap(container->iommu_data, vma);
+}
+
+static const struct file_operations vfio_fops = {
+        .owner          = THIS_MODULE,
+        .open           = vfio_fops_open,
+        .release        = vfio_fops_release,
+        .read           = vfio_fops_read,
+        .write          = vfio_fops_write,
+        .unlocked_ioctl = vfio_fops_unl_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl   = vfio_fops_compat_ioctl,
+#endif
+        .mmap           = vfio_fops_mmap,
+};
+
+/**
+ * VFIO Group fd, /dev/vfio/$GROUP
+ */
+static void __vfio_group_unset_container(struct vfio_group *group)
+{
+        struct vfio_container *container = group->container;
+        struct vfio_iommu_driver *driver;
+
+        mutex_lock(&container->group_lock);
+
+        driver = container->iommu_driver;
+        if (driver)
+                driver->ops->detach_group(container->iommu_data,
+                                          group->iommu_group);
+
+        group->container = NULL;
+        list_del(&group->container_next);
+
+        /* Detaching the last group deprivileges a container, remove iommu */
+        if (driver && list_empty(&container->group_list)) {
+                driver->ops->release(container->iommu_data);
+                module_put(driver->ops->owner);
+                container->iommu_driver = NULL;
+                container->iommu_data = NULL;
+        }
+
+        mutex_unlock(&container->group_lock);
+
+        vfio_container_put(container);
+}
+
+/*
+ * VFIO_GROUP_UNSET_CONTAINER should fail if there are other users or
+ * if there was no container to unset.  Since the ioctl is called on
+ * the group, we know that still exists, therefore the only valid
+ * transition here is 1->0.
+ */
+static int vfio_group_unset_container(struct vfio_group *group)
+{
+        int users = atomic_cmpxchg(&group->container_users, 1, 0);
+
+        if (!users)
+                return -EINVAL;
+        if (users != 1)
+                return -EBUSY;
+
+        __vfio_group_unset_container(group);
+
+        return 0;
+}
+
+/*
+ * When removing container users, anything that removes the last user
+ * implicitly removes the group from the container.  That is, if the
+ * group file descriptor is closed, as well as any device file descriptors,
+ * the group is free.
+ */
+static void vfio_group_try_dissolve_container(struct vfio_group *group)
+{
+        if (0 == atomic_dec_if_positive(&group->container_users))
+                __vfio_group_unset_container(group);
+}
+
+static int vfio_group_set_container(struct vfio_group *group, int container_fd)
+{
+        struct file *filep;
+        struct vfio_container *container;
+        struct vfio_iommu_driver *driver;
+        int ret = 0;
+
+        if (atomic_read(&group->container_users))
+                return -EINVAL;
+
+        filep = fget(container_fd);
+        if (!filep)
+                return -EBADF;
+
+        /* Sanity check, is this really our fd? */
+        if (filep->f_op != &vfio_fops) {
+                fput(filep);
+                return -EINVAL;
+        }
+
+        container = filep->private_data;
+        WARN_ON(!container); /* fget ensures we don't race vfio_release */
+
+        mutex_lock(&container->group_lock);
+
+        driver = container->iommu_driver;
+        if (driver) {
+                ret = driver->ops->attach_group(container->iommu_data,
+                                                group->iommu_group);
+                if (ret)
+                        goto unlock_out;
+        }
+
+        group->container = container;
+        list_add(&group->container_next, &container->group_list);
+
+        /* Get a reference on the container and mark a user within the group */
+        vfio_container_get(container);
+        atomic_inc(&group->container_users);
+
+unlock_out:
+        mutex_unlock(&container->group_lock);
+        fput(filep);
+
+        return ret;
+}
+
+static bool vfio_group_viable(struct vfio_group *group)
+{
+        return (iommu_group_for_each_dev(group->iommu_group,
+                                         group, vfio_dev_viable) == 0);
+}
+
+static const struct file_operations vfio_device_fops;
+
+static int vfio_group_get_device_fd(struct vfio_group *group, char *buf)
+{
+        struct vfio_device *device;
+        struct file *filep;
+        int ret = -ENODEV;
+
+        if (0 == atomic_read(&group->container_users) ||
+            !group->container->iommu_driver || !vfio_group_viable(group))
+                return -EINVAL;
+
+        mutex_lock(&group->device_lock);
+        list_for_each_entry(device, &group->device_list, group_next) {
+                if (strcmp(dev_name(device->dev), buf))
+                        continue;
+
+                ret = device->ops->open(device->device_data);
+                if (ret)
+                        break;
+                /*
+                 * We can't use anon_inode_getfd() because we need to modify
+                 * the f_mode flags directly to allow more than just ioctls
+                 */
+                ret = get_unused_fd();
+                if (ret < 0) {
+                        device->ops->release(device->device_data);
+                        break;
+                }
+
+                filep = anon_inode_getfile("[vfio-device]", &vfio_device_fops,
+                                           device, O_RDWR);
+                if (IS_ERR(filep)) {
+                        put_unused_fd(ret);
+                        ret = PTR_ERR(filep);
+                        device->ops->release(device->device_data);
+                        break;
+                }
+
+                /*
+                 * TODO: add an anon_inode interface to do this.
+                 * Appears to be missing by lack of need rather than
+                 * explicitly prevented.  Now there's need.
+                 */
+                filep->f_mode |= (FMODE_LSEEK | FMODE_PREAD | FMODE_PWRITE);
+
+                fd_install(ret, filep);
+
+                vfio_device_get(device);
+                atomic_inc(&group->container_users);
+                break;
+        }
+        mutex_unlock(&group->device_lock);
+
+        return ret;
+}
+
+static long vfio_group_fops_unl_ioctl(struct file *filep,
+                                      unsigned int cmd, unsigned long arg)
+{
+        struct vfio_group *group = filep->private_data;
+        long ret = -ENOTTY;
+
+        switch (cmd) {
+        case VFIO_GROUP_GET_STATUS:
+        {
+                struct vfio_group_status status;
+                unsigned long minsz;
+
+                minsz = offsetofend(struct vfio_group_status, flags);
+
+                if (copy_from_user(&status, (void __user *)arg, minsz))
+                        return -EFAULT;
+
+                if (status.argsz < minsz)
+                        return -EINVAL;
+
+                status.flags = 0;
+
+                if (vfio_group_viable(group))
+                        status.flags |= VFIO_GROUP_FLAGS_VIABLE;
+
+                if (group->container)
+                        status.flags |= VFIO_GROUP_FLAGS_CONTAINER_SET;
+
+                if (copy_to_user((void __user *)arg, &status, minsz))
+                        return -EFAULT;
+
+                ret = 0;
+                break;
+        }
+        case VFIO_GROUP_SET_CONTAINER:
+        {
+                int fd;
+
+                if (get_user(fd, (int __user *)arg))
+                        return -EFAULT;
+
+                if (fd < 0)
+                        return -EINVAL;
+
+                ret = vfio_group_set_container(group, fd);
+                break;
+        }
+        case VFIO_GROUP_UNSET_CONTAINER:
+                ret = vfio_group_unset_container(group);
+                break;
+        case VFIO_GROUP_GET_DEVICE_FD:
+        {
+                char *buf;
+
+                buf = strndup_user((const char __user *)arg, PAGE_SIZE);
+                if (IS_ERR(buf))
+                        return PTR_ERR(buf);
+
+                ret = vfio_group_get_device_fd(group, buf);
+                kfree(buf);
+                break;
+        }
+        }
+
+        return ret;
+}
+
+#ifdef CONFIG_COMPAT
+static long vfio_group_fops_compat_ioctl(struct file *filep,
+                                         unsigned int cmd, unsigned long arg)
+{
+        arg = (unsigned long)compat_ptr(arg);
+        return vfio_group_fops_unl_ioctl(filep, cmd, arg);
+}
+#endif  /* CONFIG_COMPAT */
+
+static int vfio_group_fops_open(struct inode *inode, struct file *filep)
+{
+        struct vfio_group *group;
+
+        group = vfio_group_get_from_minor(iminor(inode));
+        if (!group)
+                return -ENODEV;
+
+        if (group->container) {
+                vfio_group_put(group);
+                return -EBUSY;
+        }
+
+        filep->private_data = group;
+
+        return 0;
+}
+
+static int vfio_group_fops_release(struct inode *inode, struct file *filep)
+{
+        struct vfio_group *group = filep->private_data;
+
+        filep->private_data = NULL;
+
+        vfio_group_try_dissolve_container(group);
+
+        vfio_group_put(group);
+
+        return 0;
+}
+
+static const struct file_operations vfio_group_fops = {
+        .owner          = THIS_MODULE,
+        .unlocked_ioctl = vfio_group_fops_unl_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl   = vfio_group_fops_compat_ioctl,
+#endif
+        .open           = vfio_group_fops_open,
+        .release        = vfio_group_fops_release,
+};
+
+/**
+ * VFIO Device fd
+ */
+static int vfio_device_fops_release(struct inode *inode, struct file *filep)
+{
+        struct vfio_device *device = filep->private_data;
+
+        device->ops->release(device->device_data);
+
+        vfio_group_try_dissolve_container(device->group);
+
+        vfio_device_put(device);
+
+        return 0;
+}
+
+static long vfio_device_fops_unl_ioctl(struct file *filep,
+                                       unsigned int cmd, unsigned long arg)
+{
+        struct vfio_device *device = filep->private_data;
+
+        if (unlikely(!device->ops->ioctl))
+                return -EINVAL;
+
+        return device->ops->ioctl(device->device_data, cmd, arg);
+}
+
+static ssize_t vfio_device_fops_read(struct file *filep, char __user *buf,
+                                     size_t count, loff_t *ppos)
+{
+        struct vfio_device *device = filep->private_data;
+
+        if (unlikely(!device->ops->read))
+                return -EINVAL;
+
+        return device->ops->read(device->device_data, buf, count, ppos);
+}
+
+static ssize_t vfio_device_fops_write(struct file *filep,
+                                      const char __user *buf,
+                                      size_t count, loff_t *ppos)
+{
+        struct vfio_device *device = filep->private_data;
+
+        if (unlikely(!device->ops->write))
+                return -EINVAL;
+
+        return device->ops->write(device->device_data, buf, count, ppos);
+}
+
+static int vfio_device_fops_mmap(struct file *filep, struct vm_area_struct *vma)
+{
+        struct vfio_device *device = filep->private_data;
+
+        if (unlikely(!device->ops->mmap))
+                return -EINVAL;
+
+        return device->ops->mmap(device->device_data, vma);
+}
+
+#ifdef CONFIG_COMPAT
+static long vfio_device_fops_compat_ioctl(struct file *filep,
+                                          unsigned int cmd, unsigned long arg)
+{
+        arg = (unsigned long)compat_ptr(arg);
+        return vfio_device_fops_unl_ioctl(filep, cmd, arg);
+}
+#endif  /* CONFIG_COMPAT */
+
+static const struct file_operations vfio_device_fops = {
+        .owner          = THIS_MODULE,
+        .release        = vfio_device_fops_release,
+        .read           = vfio_device_fops_read,
+        .write          = vfio_device_fops_write,
+        .unlocked_ioctl = vfio_device_fops_unl_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl   = vfio_device_fops_compat_ioctl,
+#endif
+        .mmap           = vfio_device_fops_mmap,
+};
+
+/**
+ * Module/class support
+ */
+static char *vfio_devnode(struct device *dev, umode_t *mode)
+{
+        return kasprintf(GFP_KERNEL, "vfio/%s", dev_name(dev));
+}
+
+static int __init vfio_init(void)
+{
+        int ret;
+
+        idr_init(&vfio.group_idr);
+        mutex_init(&vfio.group_lock);
+        mutex_init(&vfio.iommu_drivers_lock);
+        INIT_LIST_HEAD(&vfio.group_list);
+        INIT_LIST_HEAD(&vfio.iommu_drivers_list);
+        init_waitqueue_head(&vfio.release_q);
+
+        vfio.class = class_create(THIS_MODULE, "vfio");
+        if (IS_ERR(vfio.class)) {
+                ret = PTR_ERR(vfio.class);
+                goto err_class;
+        }
+
+        vfio.class->devnode = vfio_devnode;
+
+        ret = alloc_chrdev_region(&vfio.devt, 0, MINORMASK, "vfio");
+        if (ret)
+                goto err_base_chrdev;
+
+        cdev_init(&vfio.cdev, &vfio_fops);
+        ret = cdev_add(&vfio.cdev, vfio.devt, 1);
+        if (ret)
+                goto err_base_cdev;
+
+        vfio.dev = device_create(vfio.class, NULL, vfio.devt, NULL, "vfio");
+        if (IS_ERR(vfio.dev)) {
+                ret = PTR_ERR(vfio.dev);
+                goto err_base_dev;
+        }
+
+        /* /dev/vfio/$GROUP */
+        cdev_init(&vfio.group_cdev, &vfio_group_fops);
+        ret = cdev_add(&vfio.group_cdev,
+                       MKDEV(MAJOR(vfio.devt), 1), MINORMASK - 1);
+        if (ret)
+                goto err_groups_cdev;
+
+        pr_info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
+
+        /*
+         * Attempt to load known iommu-drivers.  This gives us a working
+         * environment without the user needing to explicitly load iommu
+         * drivers.
+         */
+        request_module_nowait("vfio_iommu_type1");
+
+        return 0;
+
+err_groups_cdev:
+        device_destroy(vfio.class, vfio.devt);
+err_base_dev:
+        cdev_del(&vfio.cdev);
+err_base_cdev:
+        unregister_chrdev_region(vfio.devt, MINORMASK);
+err_base_chrdev:
+        class_destroy(vfio.class);
+        vfio.class = NULL;
+err_class:
+        return ret;
+}
+
+static void __exit vfio_cleanup(void)
+{
+        WARN_ON(!list_empty(&vfio.group_list));
+
+        idr_destroy(&vfio.group_idr);
+        cdev_del(&vfio.group_cdev);
+        device_destroy(vfio.class, vfio.devt);
+        cdev_del(&vfio.cdev);
+        unregister_chrdev_region(vfio.devt, MINORMASK);
+        class_destroy(vfio.class);
+        vfio.class = NULL;
+}
+
+module_init(vfio_init);
+module_exit(vfio_cleanup);
+
+MODULE_VERSION(DRIVER_VERSION);
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
new file mode 100644
index 000000000000..6f3fbc48a6c7
--- /dev/null
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -0,0 +1,753 @@
+/*
+ * VFIO: IOMMU DMA mapping support for Type1 IOMMU
+ *
+ * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
+ *     Author: Alex Williamson <alex.williamson@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Derived from original vfio:
+ * Copyright 2010 Cisco Systems, Inc.  All rights reserved.
+ * Author: Tom Lyon, pugs@cisco.com
+ *
+ * We arbitrarily define a Type1 IOMMU as one matching the below code.
+ * It could be called the x86 IOMMU as it's designed for AMD-Vi & Intel
+ * VT-d, but that makes it harder to re-use as theoretically anyone
+ * implementing a similar IOMMU could make use of this.  We expect the
+ * IOMMU to support the IOMMU API and have few to no restrictions around
+ * the IOVA range that can be mapped.  The Type1 IOMMU is currently
+ * optimized for relatively static mappings of a userspace process with
+ * userpsace pages pinned into memory.  We also assume devices and IOMMU
+ * domains are PCI based as the IOMMU API is still centered around a
+ * device/bus interface rather than a group interface.
+ */
+
+#include <linux/compat.h>
+#include <linux/device.h>
+#include <linux/fs.h>
+#include <linux/iommu.h>
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/pci.h>          /* pci_bus_type */
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/uaccess.h>
+#include <linux/vfio.h>
+#include <linux/workqueue.h>
+
+#define DRIVER_VERSION  "0.2"
+#define DRIVER_AUTHOR   "Alex Williamson <alex.williamson@redhat.com>"
+#define DRIVER_DESC     "Type1 IOMMU driver for VFIO"
+
+static bool allow_unsafe_interrupts;
+module_param_named(allow_unsafe_interrupts,
+                   allow_unsafe_interrupts, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(allow_unsafe_interrupts,
+                 "Enable VFIO IOMMU support for on platforms without interrupt remapping support.");
+
+struct vfio_iommu {
+        struct iommu_domain     *domain;
+        struct mutex            lock;
+        struct list_head        dma_list;
+        struct list_head        group_list;
+        bool                    cache;
+};
+
+struct vfio_dma {
+        struct list_head        next;
+        dma_addr_t              iova;           /* Device address */
+        unsigned long           vaddr;          /* Process virtual addr */
+        long                    npage;          /* Number of pages */
+        int                     prot;           /* IOMMU_READ/WRITE */
+};
+
+struct vfio_group {
+        struct iommu_group      *iommu_group;
+        struct list_head        next;
+};
+
+/*
+ * This code handles mapping and unmapping of user data buffers
+ * into DMA'ble space using the IOMMU
+ */
+
+#define NPAGE_TO_SIZE(npage)    ((size_t)(npage) << PAGE_SHIFT)
+
+struct vwork {
+        struct mm_struct        *mm;
+        long                    npage;
+        struct work_struct      work;
+};
+
+/* delayed decrement/increment for locked_vm */
+static void vfio_lock_acct_bg(struct work_struct *work)
+{
+        struct vwork *vwork = container_of(work, struct vwork, work);
+        struct mm_struct *mm;
+
+        mm = vwork->mm;
+        down_write(&mm->mmap_sem);
+        mm->locked_vm += vwork->npage;
+        up_write(&mm->mmap_sem);
+        mmput(mm);
+        kfree(vwork);
+}
+
+static void vfio_lock_acct(long npage)
+{
+        struct vwork *vwork;
+        struct mm_struct *mm;
+
+        if (!current->mm)
+                return; /* process exited */
+
+        if (down_write_trylock(&current->mm->mmap_sem)) {
+                current->mm->locked_vm += npage;
+                up_write(&current->mm->mmap_sem);
+                return;
+        }
+
+        /*
+         * Couldn't get mmap_sem lock, so must setup to update
+         * mm->locked_vm later. If locked_vm were atomic, we
+         * wouldn't need this silliness
+         */
+        vwork = kmalloc(sizeof(struct vwork), GFP_KERNEL);
+        if (!vwork)
+                return;
+        mm = get_task_mm(current);
+        if (!mm) {
+                kfree(vwork);
+                return;
+        }
+        INIT_WORK(&vwork->work, vfio_lock_acct_bg);
+        vwork->mm = mm;
+        vwork->npage = npage;
+        schedule_work(&vwork->work);
+}
+
+/*
+ * Some mappings aren't backed by a struct page, for example an mmap'd
+ * MMIO range for our own or another device.  These use a different
+ * pfn conversion and shouldn't be tracked as locked pages.
+ */
+static bool is_invalid_reserved_pfn(unsigned long pfn)
+{
+        if (pfn_valid(pfn)) {
+                bool reserved;
+                struct page *tail = pfn_to_page(pfn);
+                struct page *head = compound_trans_head(tail);
+                reserved = !!(PageReserved(head));
+                if (head != tail) {
+                        /*
+                         * "head" is not a dangling pointer
+                         * (compound_trans_head takes care of that)
+                         * but the hugepage may have been split
+                         * from under us (and we may not hold a
+                         * reference count on the head page so it can
+                         * be reused before we run PageReferenced), so
+                         * we've to check PageTail before returning
+                         * what we just read.
+                         */
+                        smp_rmb();
+                        if (PageTail(tail))
+                                return reserved;
+                }
+                return PageReserved(tail);
+        }
+
+        return true;
+}
+
+static int put_pfn(unsigned long pfn, int prot)
+{
+        if (!is_invalid_reserved_pfn(pfn)) {
+                struct page *page = pfn_to_page(pfn);
+                if (prot & IOMMU_WRITE)
+                        SetPageDirty(page);
+                put_page(page);
+                return 1;
+        }
+        return 0;
+}
+
+/* Unmap DMA region */
+static long __vfio_dma_do_unmap(struct vfio_iommu *iommu, dma_addr_t iova,
+                             long npage, int prot)
+{
+        long i, unlocked = 0;
+
+        for (i = 0; i < npage; i++, iova += PAGE_SIZE) {
+                unsigned long pfn;
+
+                pfn = iommu_iova_to_phys(iommu->domain, iova) >> PAGE_SHIFT;
+                if (pfn) {
+                        iommu_unmap(iommu->domain, iova, PAGE_SIZE);
+                        unlocked += put_pfn(pfn, prot);
+                }
+        }
+        return unlocked;
+}
+
+static void vfio_dma_unmap(struct vfio_iommu *iommu, dma_addr_t iova,
+                           long npage, int prot)
+{
+        long unlocked;
+
+        unlocked = __vfio_dma_do_unmap(iommu, iova, npage, prot);
+        vfio_lock_acct(-unlocked);
+}
+
+static int vaddr_get_pfn(unsigned long vaddr, int prot, unsigned long *pfn)
+{
+        struct page *page[1];
+        struct vm_area_struct *vma;
+        int ret = -EFAULT;
+
+        if (get_user_pages_fast(vaddr, 1, !!(prot & IOMMU_WRITE), page) == 1) {
+                *pfn = page_to_pfn(page[0]);
+                return 0;
+        }
+
+        down_read(&current->mm->mmap_sem);
+
+        vma = find_vma_intersection(current->mm, vaddr, vaddr + 1);
+
+        if (vma && vma->vm_flags & VM_PFNMAP) {
+                *pfn = ((vaddr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
+                if (is_invalid_reserved_pfn(*pfn))
+                        ret = 0;
+        }
+
+        up_read(&current->mm->mmap_sem);
+
+        return ret;
+}
+
+/* Map DMA region */
+static int __vfio_dma_map(struct vfio_iommu *iommu, dma_addr_t iova,
+                          unsigned long vaddr, long npage, int prot)
+{
+        dma_addr_t start = iova;
+        long i, locked = 0;
+        int ret;
+
+        /* Verify that pages are not already mapped */
+        for (i = 0; i < npage; i++, iova += PAGE_SIZE)
+                if (iommu_iova_to_phys(iommu->domain, iova))
+                        return -EBUSY;
+
+        iova = start;
+
+        if (iommu->cache)
+                prot |= IOMMU_CACHE;
+
+        /*
+         * XXX We break mappings into pages and use get_user_pages_fast to
+         * pin the pages in memory.  It's been suggested that mlock might
+         * provide a more efficient mechanism, but nothing prevents the
+         * user from munlocking the pages, which could then allow the user
+         * access to random host memory.  We also have no guarantee from the
+         * IOMMU API that the iommu driver can unmap sub-pages of previous
+         * mappings.  This means we might lose an entire range if a single
+         * page within it is unmapped.  Single page mappings are inefficient,
+         * but provide the most flexibility for now.
+         */
+        for (i = 0; i < npage; i++, iova += PAGE_SIZE, vaddr += PAGE_SIZE) {
+                unsigned long pfn = 0;
+
+                ret = vaddr_get_pfn(vaddr, prot, &pfn);
+                if (ret) {
+                        __vfio_dma_do_unmap(iommu, start, i, prot);
+                        return ret;
+                }
+
+                /*
+                 * Only add actual locked pages to accounting
+                 * XXX We're effectively marking a page locked for every
+                 * IOVA page even though it's possible the user could be
+                 * backing multiple IOVAs with the same vaddr.  This over-
+                 * penalizes the user process, but we currently have no
+                 * easy way to do this properly.
+                 */
+                if (!is_invalid_reserved_pfn(pfn))
+                        locked++;
+
+                ret = iommu_map(iommu->domain, iova,
+                                (phys_addr_t)pfn << PAGE_SHIFT,
+                                PAGE_SIZE, prot);
+                if (ret) {
+                        /* Back out mappings on error */
+                        put_pfn(pfn, prot);
+                        __vfio_dma_do_unmap(iommu, start, i, prot);
+                        return ret;
+                }
+        }
+        vfio_lock_acct(locked);
+        return 0;
+}
+
+static inline bool ranges_overlap(dma_addr_t start1, size_t size1,
+                                  dma_addr_t start2, size_t size2)
+{
+        if (start1 < start2)
+                return (start2 - start1 < size1);
+        else if (start2 < start1)
+                return (start1 - start2 < size2);
+        return (size1 > 0 && size2 > 0);
+}
+
+static struct vfio_dma *vfio_find_dma(struct vfio_iommu *iommu,
+                                                dma_addr_t start, size_t size)
+{
+        struct vfio_dma *dma;
+
+        list_for_each_entry(dma, &iommu->dma_list, next) {
+                if (ranges_overlap(dma->iova, NPAGE_TO_SIZE(dma->npage),
+                                   start, size))
+                        return dma;
+        }
+        return NULL;
+}
+
+static long vfio_remove_dma_overlap(struct vfio_iommu *iommu, dma_addr_t start,
+                                    size_t size, struct vfio_dma *dma)
+{
+        struct vfio_dma *split;
+        long npage_lo, npage_hi;
+
+        /* Existing dma region is completely covered, unmap all */
+        if (start <= dma->iova &&
+            start + size >= dma->iova + NPAGE_TO_SIZE(dma->npage)) {
+                vfio_dma_unmap(iommu, dma->iova, dma->npage, dma->prot);
+                list_del(&dma->next);
+                npage_lo = dma->npage;
+                kfree(dma);
+                return npage_lo;
+        }
+
+        /* Overlap low address of existing range */
+        if (start <= dma->iova) {
+                size_t overlap;
+
+                overlap = start + size - dma->iova;
+                npage_lo = overlap >> PAGE_SHIFT;
+
+                vfio_dma_unmap(iommu, dma->iova, npage_lo, dma->prot);
+                dma->iova += overlap;
+                dma->vaddr += overlap;
+                dma->npage -= npage_lo;
+                return npage_lo;
+        }
+
+        /* Overlap high address of existing range */
+        if (start + size >= dma->iova + NPAGE_TO_SIZE(dma->npage)) {
+                size_t overlap;
+
+                overlap = dma->iova + NPAGE_TO_SIZE(dma->npage) - start;
+                npage_hi = overlap >> PAGE_SHIFT;
+
+                vfio_dma_unmap(iommu, start, npage_hi, dma->prot);
+                dma->npage -= npage_hi;
+                return npage_hi;
+        }
+
+        /* Split existing */
+        npage_lo = (start - dma->iova) >> PAGE_SHIFT;
+        npage_hi = dma->npage - (size >> PAGE_SHIFT) - npage_lo;
+
+        split = kzalloc(sizeof *split, GFP_KERNEL);
+        if (!split)
+                return -ENOMEM;
+
+        vfio_dma_unmap(iommu, start, size >> PAGE_SHIFT, dma->prot);
+
+        dma->npage = npage_lo;
+
+        split->npage = npage_hi;
+        split->iova = start + size;
+        split->vaddr = dma->vaddr + NPAGE_TO_SIZE(npage_lo) + size;
+        split->prot = dma->prot;
+        list_add(&split->next, &iommu->dma_list);
+        return size >> PAGE_SHIFT;
+}
+
+static int vfio_dma_do_unmap(struct vfio_iommu *iommu,
+                             struct vfio_iommu_type1_dma_unmap *unmap)
+{
+        long ret = 0, npage = unmap->size >> PAGE_SHIFT;
+        struct vfio_dma *dma, *tmp;
+        uint64_t mask;
+
+        mask = ((uint64_t)1 << __ffs(iommu->domain->ops->pgsize_bitmap)) - 1;
+
+        if (unmap->iova & mask)
+                return -EINVAL;
+        if (unmap->size & mask)
+                return -EINVAL;
+
+        /* XXX We still break these down into PAGE_SIZE */
+        WARN_ON(mask & PAGE_MASK);
+
+        mutex_lock(&iommu->lock);
+
+        list_for_each_entry_safe(dma, tmp, &iommu->dma_list, next) {
+                if (ranges_overlap(dma->iova, NPAGE_TO_SIZE(dma->npage),
+                                   unmap->iova, unmap->size)) {
+                        ret = vfio_remove_dma_overlap(iommu, unmap->iova,
+                                                      unmap->size, dma);
+                        if (ret > 0)
+                                npage -= ret;
+                        if (ret < 0 || npage == 0)
+                                break;
+                }
+        }
+        mutex_unlock(&iommu->lock);
+        return ret > 0 ? 0 : (int)ret;
+}
+
+static int vfio_dma_do_map(struct vfio_iommu *iommu,
+                           struct vfio_iommu_type1_dma_map *map)
+{
+        struct vfio_dma *dma, *pdma = NULL;
+        dma_addr_t iova = map->iova;
+        unsigned long locked, lock_limit, vaddr = map->vaddr;
+        size_t size = map->size;
+        int ret = 0, prot = 0;
+        uint64_t mask;
+        long npage;
+
+        mask = ((uint64_t)1 << __ffs(iommu->domain->ops->pgsize_bitmap)) - 1;
+
+        /* READ/WRITE from device perspective */
+        if (map->flags & VFIO_DMA_MAP_FLAG_WRITE)
+                prot |= IOMMU_WRITE;
+        if (map->flags & VFIO_DMA_MAP_FLAG_READ)
+                prot |= IOMMU_READ;
+
+        if (!prot)
+                return -EINVAL; /* No READ/WRITE? */
+
+        if (vaddr & mask)
+                return -EINVAL;
+        if (iova & mask)
+                return -EINVAL;
+        if (size & mask)
+                return -EINVAL;
+
+        /* XXX We still break these down into PAGE_SIZE */
+        WARN_ON(mask & PAGE_MASK);
+
+        /* Don't allow IOVA wrap */
+        if (iova + size && iova + size < iova)
+                return -EINVAL;
+
+        /* Don't allow virtual address wrap */
+        if (vaddr + size && vaddr + size < vaddr)
+                return -EINVAL;
+
+        npage = size >> PAGE_SHIFT;
+        if (!npage)
+                return -EINVAL;
+
+        mutex_lock(&iommu->lock);
+
+        if (vfio_find_dma(iommu, iova, size)) {
+                ret = -EBUSY;
+                goto out_lock;
+        }
+
+        /* account for locked pages */
+        locked = current->mm->locked_vm + npage;
+        lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT;
+        if (locked > lock_limit && !capable(CAP_IPC_LOCK)) {
+                pr_warn("%s: RLIMIT_MEMLOCK (%ld) exceeded\n",
+                        __func__, rlimit(RLIMIT_MEMLOCK));
+                ret = -ENOMEM;
+                goto out_lock;
+        }
+
+        ret = __vfio_dma_map(iommu, iova, vaddr, npage, prot);
+        if (ret)
+                goto out_lock;
+
+        /* Check if we abut a region below - nothing below 0 */
+        if (iova) {
+                dma = vfio_find_dma(iommu, iova - 1, 1);
+                if (dma && dma->prot == prot &&
+                    dma->vaddr + NPAGE_TO_SIZE(dma->npage) == vaddr) {
+
+                        dma->npage += npage;
+                        iova = dma->iova;
+                        vaddr = dma->vaddr;
+                        npage = dma->npage;
+                        size = NPAGE_TO_SIZE(npage);
+
+                        pdma = dma;
+                }
+        }
+
+        /* Check if we abut a region above - nothing above ~0 + 1 */
+        if (iova + size) {
+                dma = vfio_find_dma(iommu, iova + size, 1);
+                if (dma && dma->prot == prot &&
+                    dma->vaddr == vaddr + size) {
+
+                        dma->npage += npage;
+                        dma->iova = iova;
+                        dma->vaddr = vaddr;
+
+                        /*
+                         * If merged above and below, remove previously
+                         * merged entry.  New entry covers it.
+                         */
+                        if (pdma) {
+                                list_del(&pdma->next);
+                                kfree(pdma);
+                        }
+                        pdma = dma;
+                }
+        }
+
+        /* Isolated, new region */
+        if (!pdma) {
+                dma = kzalloc(sizeof *dma, GFP_KERNEL);
+                if (!dma) {
+                        ret = -ENOMEM;
+                        vfio_dma_unmap(iommu, iova, npage, prot);
+                        goto out_lock;
+                }
+
+                dma->npage = npage;
+                dma->iova = iova;
+                dma->vaddr = vaddr;
+                dma->prot = prot;
+                list_add(&dma->next, &iommu->dma_list);
+        }
+
+out_lock:
+        mutex_unlock(&iommu->lock);
+        return ret;
+}
+
+static int vfio_iommu_type1_attach_group(void *iommu_data,
+                                         struct iommu_group *iommu_group)
+{
+        struct vfio_iommu *iommu = iommu_data;
+        struct vfio_group *group, *tmp;
+        int ret;
+
+        group = kzalloc(sizeof(*group), GFP_KERNEL);
+        if (!group)
+                return -ENOMEM;
+
+        mutex_lock(&iommu->lock);
+
+        list_for_each_entry(tmp, &iommu->group_list, next) {
+                if (tmp->iommu_group == iommu_group) {
+                        mutex_unlock(&iommu->lock);
+                        kfree(group);
+                        return -EINVAL;
+                }
+        }
+
+        /*
+         * TODO: Domain have capabilities that might change as we add
+         * groups (see iommu->cache, currently never set).  Check for
+         * them and potentially disallow groups to be attached when it
+         * would change capabilities (ugh).
+         */
+        ret = iommu_attach_group(iommu->domain, iommu_group);
+        if (ret) {
+                mutex_unlock(&iommu->lock);
+                kfree(group);
+                return ret;
+        }
+
+        group->iommu_group = iommu_group;
+        list_add(&group->next, &iommu->group_list);
+
+        mutex_unlock(&iommu->lock);
+
+        return 0;
+}
+
+static void vfio_iommu_type1_detach_group(void *iommu_data,
+                                          struct iommu_group *iommu_group)
+{
+        struct vfio_iommu *iommu = iommu_data;
+        struct vfio_group *group;
+
+        mutex_lock(&iommu->lock);
+
+        list_for_each_entry(group, &iommu->group_list, next) {
+                if (group->iommu_group == iommu_group) {
+                        iommu_detach_group(iommu->domain, iommu_group);
+                        list_del(&group->next);
+                        kfree(group);
+                        break;
+                }
+        }
+
+        mutex_unlock(&iommu->lock);
+}
+
+static void *vfio_iommu_type1_open(unsigned long arg)
+{
+        struct vfio_iommu *iommu;
+
+        if (arg != VFIO_TYPE1_IOMMU)
+                return ERR_PTR(-EINVAL);
+
+        iommu = kzalloc(sizeof(*iommu), GFP_KERNEL);
+        if (!iommu)
+                return ERR_PTR(-ENOMEM);
+
+        INIT_LIST_HEAD(&iommu->group_list);
+        INIT_LIST_HEAD(&iommu->dma_list);
+        mutex_init(&iommu->lock);
+
+        /*
+         * Wish we didn't have to know about bus_type here.
+         */
+        iommu->domain = iommu_domain_alloc(&pci_bus_type);
+        if (!iommu->domain) {
+                kfree(iommu);
+                return ERR_PTR(-EIO);
+        }
+
+        /*
+         * Wish we could specify required capabilities rather than create
+         * a domain, see what comes out and hope it doesn't change along
+         * the way.  Fortunately we know interrupt remapping is global for
+         * our iommus.
+         */
+        if (!allow_unsafe_interrupts &&
+            !iommu_domain_has_cap(iommu->domain, IOMMU_CAP_INTR_REMAP)) {
+                pr_warn("%s: No interrupt remapping support.  Use the module param \"allow_unsafe_interrupts\" to enable VFIO IOMMU support on this platform\n",
+                       __func__);
+                iommu_domain_free(iommu->domain);
+                kfree(iommu);
+                return ERR_PTR(-EPERM);
+        }
+
+        return iommu;
+}
+
+static void vfio_iommu_type1_release(void *iommu_data)
+{
+        struct vfio_iommu *iommu = iommu_data;
+        struct vfio_group *group, *group_tmp;
+        struct vfio_dma *dma, *dma_tmp;
+
+        list_for_each_entry_safe(group, group_tmp, &iommu->group_list, next) {
+                iommu_detach_group(iommu->domain, group->iommu_group);
+                list_del(&group->next);
+                kfree(group);
+        }
+
+        list_for_each_entry_safe(dma, dma_tmp, &iommu->dma_list, next) {
+                vfio_dma_unmap(iommu, dma->iova, dma->npage, dma->prot);
+                list_del(&dma->next);
+                kfree(dma);
+        }
+
+        iommu_domain_free(iommu->domain);
+        iommu->domain = NULL;
+        kfree(iommu);
+}
+
+static long vfio_iommu_type1_ioctl(void *iommu_data,
+                                   unsigned int cmd, unsigned long arg)
+{
+        struct vfio_iommu *iommu = iommu_data;
+        unsigned long minsz;
+
+        if (cmd == VFIO_CHECK_EXTENSION) {
+                switch (arg) {
+                case VFIO_TYPE1_IOMMU:
+                        return 1;
+                default:
+                        return 0;
+                }
+        } else if (cmd == VFIO_IOMMU_GET_INFO) {
+                struct vfio_iommu_type1_info info;
+
+                minsz = offsetofend(struct vfio_iommu_type1_info, iova_pgsizes);
+
+                if (copy_from_user(&info, (void __user *)arg, minsz))
+                        return -EFAULT;
+
+                if (info.argsz < minsz)
+                        return -EINVAL;
+
+                info.flags = 0;
+
+                info.iova_pgsizes = iommu->domain->ops->pgsize_bitmap;
+
+                return copy_to_user((void __user *)arg, &info, minsz);
+
+        } else if (cmd == VFIO_IOMMU_MAP_DMA) {
+                struct vfio_iommu_type1_dma_map map;
+                uint32_t mask = VFIO_DMA_MAP_FLAG_READ |
+                                VFIO_DMA_MAP_FLAG_WRITE;
+
+                minsz = offsetofend(struct vfio_iommu_type1_dma_map, size);
+
+                if (copy_from_user(&map, (void __user *)arg, minsz))
+                        return -EFAULT;
+
+                if (map.argsz < minsz || map.flags & ~mask)
+                        return -EINVAL;
+
+                return vfio_dma_do_map(iommu, &map);
+
+        } else if (cmd == VFIO_IOMMU_UNMAP_DMA) {
+                struct vfio_iommu_type1_dma_unmap unmap;
+
+                minsz = offsetofend(struct vfio_iommu_type1_dma_unmap, size);
+
+                if (copy_from_user(&unmap, (void __user *)arg, minsz))
+                        return -EFAULT;
+
+                if (unmap.argsz < minsz || unmap.flags)
+                        return -EINVAL;
+
+                return vfio_dma_do_unmap(iommu, &unmap);
+        }
+
+        return -ENOTTY;
+}
+
+static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = {
+        .name           = "vfio-iommu-type1",
+        .owner          = THIS_MODULE,
+        .open           = vfio_iommu_type1_open,
+        .release        = vfio_iommu_type1_release,
+        .ioctl          = vfio_iommu_type1_ioctl,
+        .attach_group   = vfio_iommu_type1_attach_group,
+        .detach_group   = vfio_iommu_type1_detach_group,
+};
+
+static int __init vfio_iommu_type1_init(void)
+{
+        if (!iommu_present(&pci_bus_type))
+                return -ENODEV;
+
+        return vfio_register_iommu_driver(&vfio_iommu_driver_ops_type1);
+}
+
+static void __exit vfio_iommu_type1_cleanup(void)
+{
+        vfio_unregister_iommu_driver(&vfio_iommu_driver_ops_type1);
+}
+
+module_init(vfio_iommu_type1_init);
+module_exit(vfio_iommu_type1_cleanup);
+
+MODULE_VERSION(DRIVER_VERSION);
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);