Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:

 - Some cleanups at V4L2 documentation

 - new drivers: ts2020 frontend, ov9650 sensor, s5c73m3 sensor,
   sh-mobile veu mem2mem driver, radio-ma901, davinci_vpfe staging
   driver

 - Lots of missing MAINTAINERS entries added

 - several em28xx driver improvements, including its conversion to
   videobuf2

 - several fixups on drivers to make them to better comply with the API

 - DVB core: add support for DVBv5 stats, allowing the implementation of
   statistics for new standards like ISDB

 - mb86a20s: add statistics to the driver

 - lots of new board additions, cleanups, and driver improvements.

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (596 commits)
  [media] media: Add 0x3009 USB PID to ttusb2 driver (fixed diff)
  [media] rtl28xxu: Add USB IDs for Compro VideoMate U620F
  [media] em28xx: add usb id for terratec h5 rev. 3
  [media] media: rc: gpio-ir-recv: add support for device tree parsing
  [media] mceusb: move check earlier to make smatch happy
  [media] radio-si470x doc: add info about v4l2-ctl and sox+alsa
  [media] staging: media: Remove unnecessary OOM messages
  [media] sh_vou: Use vou_dev instead of vou_file wherever possible
  [media] sh_vou: Use video_drvdata()
  [media] drivers/media/platform/soc_camera/pxa_camera.c: use devm_ functions
  [media] mt9t112: mt9t111 format set up differs from mt9t112
  [media] sh-mobile-ceu-camera: fix SHARPNESS control default
  Revert "[media] fc0011: Return early, if the frequency is already tuned"
  [media] cx18/ivtv: fix regression: remove __init from a non-init function
  [media] em28xx: fix analog streaming with USB bulk transfers
  [media] stv0900: remove unnecessary null pointer check
  [media] fc0011: Return early, if the frequency is already tuned
  [media] fc0011: Add some sanity checks and cleanups
  [media] fc0011: Fix xin value clamping
  Revert "[media] [PATH,1/2] mxl5007 move reset to attach"
  ...

17 files changed, 302 insertions, 162 deletions

diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c
index 2d6fb26a0170..4d6a63fe6c5e 100644
--- a/drivers/media/rc/ati_remote.c
+++ b/drivers/media/rc/ati_remote.c
@@ -872,11 +872,11 @@ static int ati_remote_probe(struct usb_interface *interface,
         ati_remote = kzalloc(sizeof (struct ati_remote), GFP_KERNEL);
         rc_dev = rc_allocate_device();
         if (!ati_remote || !rc_dev)
-                goto fail1;
+                goto exit_free_dev_rdev;
 
         /* Allocate URB buffers, URBs */
         if (ati_remote_alloc_buffers(udev, ati_remote))
-                goto fail2;
+                goto exit_free_buffers;
 
         ati_remote->endpoint_in = endpoint_in;
         ati_remote->endpoint_out = endpoint_out;
@@ -924,12 +924,12 @@ static int ati_remote_probe(struct usb_interface *interface,
         /* Device Hardware Initialization - fills in ati_remote->idev from udev. */
         err = ati_remote_initialize(ati_remote);
         if (err)
-                goto fail3;
+                goto exit_kill_urbs;
 
         /* Set up and register rc device */
         err = rc_register_device(ati_remote->rdev);
         if (err)
-                goto fail3;
+                goto exit_kill_urbs;
 
         /* use our delay for rc_dev */
         ati_remote->rdev->input_dev->rep[REP_DELAY] = repeat_delay;
@@ -939,7 +939,7 @@ static int ati_remote_probe(struct usb_interface *interface,
                 input_dev = input_allocate_device();
                 if (!input_dev) {
                         err = -ENOMEM;
-                        goto fail4;
+                        goto exit_unregister_device;
                 }
 
                 ati_remote->idev = input_dev;
@@ -947,19 +947,24 @@ static int ati_remote_probe(struct usb_interface *interface,
                 err = input_register_device(input_dev);
 
                 if (err)
-                        goto fail5;
+                        goto exit_free_input_device;
         }
 
         usb_set_intfdata(interface, ati_remote);
         return 0;
 
- fail5: input_free_device(input_dev);
- fail4: rc_unregister_device(rc_dev);
+ exit_free_input_device:
+        input_free_device(input_dev);
+ exit_unregister_device:
+        rc_unregister_device(rc_dev);
         rc_dev = NULL;
- fail3: usb_kill_urb(ati_remote->irq_urb);
+ exit_kill_urbs:
+        usb_kill_urb(ati_remote->irq_urb);
         usb_kill_urb(ati_remote->out_urb);
- fail2: ati_remote_free_buffers(ati_remote);
- fail1: rc_free_device(rc_dev);
+ exit_free_buffers:
+        ati_remote_free_buffers(ati_remote);
+ exit_free_dev_rdev:
+         rc_free_device(rc_dev);
         kfree(ati_remote);
         return err;
 }
diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c
index cef04786b52f..ee6c984cade2 100644
--- a/drivers/media/rc/ene_ir.c
+++ b/drivers/media/rc/ene_ir.c
@@ -1003,7 +1003,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
         dev = kzalloc(sizeof(struct ene_device), GFP_KERNEL);
         rdev = rc_allocate_device();
         if (!dev || !rdev)
-                goto failure;
+                goto exit_free_dev_rdev;
 
         /* validate resources */
         error = -ENODEV;
@@ -1014,10 +1014,10 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
 
         if (!pnp_port_valid(pnp_dev, 0) ||
             pnp_port_len(pnp_dev, 0) < ENE_IO_SIZE)
-                goto failure;
+                goto exit_free_dev_rdev;
 
         if (!pnp_irq_valid(pnp_dev, 0))
-                goto failure;
+                goto exit_free_dev_rdev;
 
         spin_lock_init(&dev->hw_lock);
 
@@ -1033,7 +1033,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
         /* detect hardware version and features */
         error = ene_hw_detect(dev);
         if (error)
-                goto failure;
+                goto exit_free_dev_rdev;
 
         if (!dev->hw_learning_and_tx_capable && txsim) {
                 dev->hw_learning_and_tx_capable = true;
@@ -1075,30 +1075,30 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
         device_set_wakeup_capable(&pnp_dev->dev, true);
         device_set_wakeup_enable(&pnp_dev->dev, true);
 
+        error = rc_register_device(rdev);
+        if (error < 0)
+                goto exit_free_dev_rdev;
+
         /* claim the resources */
         error = -EBUSY;
         if (!request_region(dev->hw_io, ENE_IO_SIZE, ENE_DRIVER_NAME)) {
-                goto failure;
+                goto exit_unregister_device;
         }
 
         dev->irq = pnp_irq(pnp_dev, 0);
         if (request_irq(dev->irq, ene_isr,
                         IRQF_SHARED, ENE_DRIVER_NAME, (void *)dev)) {
-                goto failure2;
+                goto exit_release_hw_io;
         }
 
-        error = rc_register_device(rdev);
-        if (error < 0)
-                goto failure3;
-
         pr_notice("driver has been successfully loaded\n");
         return 0;
 
-failure3:
-        free_irq(dev->irq, dev);
-failure2:
+exit_release_hw_io:
         release_region(dev->hw_io, ENE_IO_SIZE);
-failure:
+exit_unregister_device:
+        rc_unregister_device(rdev);
+exit_free_dev_rdev:
         rc_free_device(rdev);
         kfree(dev);
         return error;
diff --git a/drivers/media/rc/fintek-cir.c b/drivers/media/rc/fintek-cir.c
index 1df410e13688..d6fa441655d2 100644
--- a/drivers/media/rc/fintek-cir.c
+++ b/drivers/media/rc/fintek-cir.c
@@ -500,18 +500,18 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
         /* input device for IR remote (and tx) */
         rdev = rc_allocate_device();
         if (!rdev)
-                goto failure;
+                goto exit_free_dev_rdev;
 
         ret = -ENODEV;
         /* validate pnp resources */
         if (!pnp_port_valid(pdev, 0)) {
                 dev_err(&pdev->dev, "IR PNP Port not valid!\n");
-                goto failure;
+                goto exit_free_dev_rdev;
         }
 
         if (!pnp_irq_valid(pdev, 0)) {
                 dev_err(&pdev->dev, "IR PNP IRQ not valid!\n");
-                goto failure;
+                goto exit_free_dev_rdev;
         }
 
         fintek->cir_addr = pnp_port_start(pdev, 0);
@@ -528,7 +528,7 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
 
         ret = fintek_hw_detect(fintek);
         if (ret)
-                goto failure;
+                goto exit_free_dev_rdev;
 
         /* Initialize CIR & CIR Wake Logical Devices */
         fintek_config_mode_enable(fintek);
@@ -557,33 +557,35 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
         /* rx resolution is hardwired to 50us atm, 1, 25, 100 also possible */
         rdev->rx_resolution = US_TO_NS(CIR_SAMPLE_PERIOD);
 
+        fintek->rdev = rdev;
+
         ret = -EBUSY;
         /* now claim resources */
         if (!request_region(fintek->cir_addr,
                             fintek->cir_port_len, FINTEK_DRIVER_NAME))
-                goto failure;
+                goto exit_free_dev_rdev;
 
         if (request_irq(fintek->cir_irq, fintek_cir_isr, IRQF_SHARED,
                         FINTEK_DRIVER_NAME, (void *)fintek))
-                goto failure2;
+                goto exit_free_cir_addr;
 
         ret = rc_register_device(rdev);
         if (ret)
-                goto failure3;
+                goto exit_free_irq;
 
         device_init_wakeup(&pdev->dev, true);
-        fintek->rdev = rdev;
+
         fit_pr(KERN_NOTICE, "driver has been successfully loaded\n");
         if (debug)
                 cir_dump_regs(fintek);
 
         return 0;
 
-failure3:
+exit_free_irq:
         free_irq(fintek->cir_irq, fintek);
-failure2:
+exit_free_cir_addr:
         release_region(fintek->cir_addr, fintek->cir_port_len);
-failure:
+exit_free_dev_rdev:
         rc_free_device(rdev);
         kfree(fintek);
 
diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
index 4f71a7d1f019..8b82ae9bd686 100644
--- a/drivers/media/rc/gpio-ir-recv.c
+++ b/drivers/media/rc/gpio-ir-recv.c
@@ -16,6 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
+#include <linux/of_gpio.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
 #include <media/rc-core.h>
@@ -30,6 +31,45 @@ struct gpio_rc_dev {
         bool active_low;
 };
 
+#ifdef CONFIG_OF
+/*
+ * Translate OpenFirmware node properties into platform_data
+ */
+static int gpio_ir_recv_get_devtree_pdata(struct device *dev,
+                                  struct gpio_ir_recv_platform_data *pdata)
+{
+        struct device_node *np = dev->of_node;
+        enum of_gpio_flags flags;
+        int gpio;
+
+        gpio = of_get_gpio_flags(np, 0, &flags);
+        if (gpio < 0) {
+                if (gpio != -EPROBE_DEFER)
+                        dev_err(dev, "Failed to get gpio flags (%d)\n", gpio);
+                return gpio;
+        }
+
+        pdata->gpio_nr = gpio;
+        pdata->active_low = (flags & OF_GPIO_ACTIVE_LOW);
+        /* probe() takes care of map_name == NULL or allowed_protos == 0 */
+        pdata->map_name = of_get_property(np, "linux,rc-map-name", NULL);
+        pdata->allowed_protos = 0;
+
+        return 0;
+}
+
+static struct of_device_id gpio_ir_recv_of_match[] = {
+        { .compatible = "gpio-ir-receiver", },
+        { },
+};
+MODULE_DEVICE_TABLE(of, gpio_ir_recv_of_match);
+
+#else /* !CONFIG_OF */
+
+#define gpio_ir_recv_get_devtree_pdata(dev, pdata)      (-ENOSYS)
+
+#endif
+
 static irqreturn_t gpio_ir_recv_irq(int irq, void *dev_id)
 {
         struct gpio_rc_dev *gpio_dev = dev_id;
@@ -66,6 +106,17 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
                                         pdev->dev.platform_data;
         int rc;
 
+        if (pdev->dev.of_node) {
+                struct gpio_ir_recv_platform_data *dtpdata =
+                        devm_kzalloc(&pdev->dev, sizeof(*dtpdata), GFP_KERNEL);
+                if (!dtpdata)
+                        return -ENOMEM;
+                rc = gpio_ir_recv_get_devtree_pdata(&pdev->dev, dtpdata);
+                if (rc)
+                        return rc;
+                pdata = dtpdata;
+        }
+
         if (!pdata)
                 return -EINVAL;
 
@@ -129,12 +180,12 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
 err_request_irq:
         platform_set_drvdata(pdev, NULL);
         rc_unregister_device(rcdev);
+        rcdev = NULL;
 err_register_rc_device:
 err_gpio_direction_input:
         gpio_free(pdata->gpio_nr);
 err_gpio_request:
         rc_free_device(rcdev);
-        rcdev = NULL;
 err_allocate_device:
         kfree(gpio_dev);
         return rc;
@@ -148,7 +199,6 @@ static int gpio_ir_recv_remove(struct platform_device *pdev)
         platform_set_drvdata(pdev, NULL);
         rc_unregister_device(gpio_dev->rcdev);
         gpio_free(gpio_dev->gpio_nr);
-        rc_free_device(gpio_dev->rcdev);
         kfree(gpio_dev);
         return 0;
 }
@@ -192,6 +242,7 @@ static struct platform_driver gpio_ir_recv_driver = {
         .driver = {
                 .name   = GPIO_IR_DRIVER_NAME,
                 .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(gpio_ir_recv_of_match),
 #ifdef CONFIG_PM
                 .pm     = &gpio_ir_recv_pm_ops,
 #endif
diff --git a/drivers/media/rc/iguanair.c b/drivers/media/rc/iguanair.c
index b99b096d8a8f..a4ab2e6b3f82 100644
--- a/drivers/media/rc/iguanair.c
+++ b/drivers/media/rc/iguanair.c
@@ -58,6 +58,7 @@ struct iguanair {
         char phys[64];
 };
 
+#define CMD_NOP                 0x00
 #define CMD_GET_VERSION         0x01
 #define CMD_GET_BUFSIZE         0x11
 #define CMD_GET_FEATURES        0x10
@@ -196,6 +197,10 @@ static void iguanair_irq_out(struct urb *urb)
 
         if (urb->status)
                 dev_dbg(ir->dev, "Error: out urb status = %d\n", urb->status);
+
+        /* if we sent an nop packet, do not expect a response */
+        if (urb->status == 0 && ir->packet->header.cmd == CMD_NOP)
+                complete(&ir->completion);
 }
 
 static int iguanair_send(struct iguanair *ir, unsigned size)
@@ -219,10 +224,17 @@ static int iguanair_get_features(struct iguanair *ir)
 {
         int rc;
 
+        /*
+         * On cold boot, the iguanair initializes on the first packet
+         * received but does not process that packet. Send an empty
+         * packet.
+         */
         ir->packet->header.start = 0;
         ir->packet->header.direction = DIR_OUT;
-        ir->packet->header.cmd = CMD_GET_VERSION;
+        ir->packet->header.cmd = CMD_NOP;
+        iguanair_send(ir, sizeof(ir->packet->header));
 
+        ir->packet->header.cmd = CMD_GET_VERSION;
         rc = iguanair_send(ir, sizeof(ir->packet->header));
         if (rc) {
                 dev_info(ir->dev, "failed to get version\n");
@@ -255,19 +267,14 @@ static int iguanair_get_features(struct iguanair *ir)
         ir->packet->header.cmd = CMD_GET_FEATURES;
 
         rc = iguanair_send(ir, sizeof(ir->packet->header));
-        if (rc) {
+        if (rc)
                 dev_info(ir->dev, "failed to get features\n");
-                goto out;
-        }
-
 out:
         return rc;
 }
 
 static int iguanair_receiver(struct iguanair *ir, bool enable)
 {
-        int rc;
-
         ir->packet->header.start = 0;
         ir->packet->header.direction = DIR_OUT;
         ir->packet->header.cmd = enable ? CMD_RECEIVER_ON : CMD_RECEIVER_OFF;
@@ -275,9 +282,7 @@ static int iguanair_receiver(struct iguanair *ir, bool enable)
         if (enable)
                 ir_raw_event_reset(ir->rc);
 
-        rc = iguanair_send(ir, sizeof(ir->packet->header));
-
-        return rc;
+        return iguanair_send(ir, sizeof(ir->packet->header));
 }
 
 /*
@@ -512,6 +517,7 @@ static int iguanair_probe(struct usb_interface *intf,
         rc->rx_resolution = RX_RESOLUTION;
 
         iguanair_set_tx_carrier(rc, 38000);
+        iguanair_set_tx_mask(rc, 0);
 
         ret = rc_register_device(rc);
         if (ret < 0) {
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 78d109b978dd..dec203bb06f6 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -1221,7 +1221,7 @@ static u32 imon_panel_key_lookup(u64 code)
 static bool imon_mouse_event(struct imon_context *ictx,
                              unsigned char *buf, int len)
 {
-        char rel_x = 0x00, rel_y = 0x00;
+        signed char rel_x = 0x00, rel_y = 0x00;
         u8 right_shift = 1;
         bool mouse_input = true;
         int dir = 0;
@@ -1297,7 +1297,7 @@ static void imon_touch_event(struct imon_context *ictx, unsigned char *buf)
 static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf)
 {
         int dir = 0;
-        char rel_x = 0x00, rel_y = 0x00;
+        signed char rel_x = 0x00, rel_y = 0x00;
         u16 timeout, threshold;
         u32 scancode = KEY_RESERVED;
         unsigned long flags;
diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c
index 97dc8d13b06b..17c94be9f24c 100644
--- a/drivers/media/rc/ir-raw.c
+++ b/drivers/media/rc/ir-raw.c
@@ -31,11 +31,6 @@ static DEFINE_MUTEX(ir_raw_handler_lock);
 static LIST_HEAD(ir_raw_handler_list);
 static u64 available_protocols;
 
-#ifdef MODULE
-/* Used to load the decoders */
-static struct work_struct wq_load;
-#endif
-
 static int ir_raw_event_thread(void *data)
 {
         struct ir_raw_event ev;
@@ -347,8 +342,7 @@ void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler)
 }
 EXPORT_SYMBOL(ir_raw_handler_unregister);
 
-#ifdef MODULE
-static void init_decoders(struct work_struct *work)
+void ir_raw_init(void)
 {
         /* Load the decoder modules */
 
@@ -365,12 +359,3 @@ static void init_decoders(struct work_struct *work)
            it is needed to change the CONFIG_MODULE test at rc-core.h
          */
 }
-#endif
-
-void ir_raw_init(void)
-{
-#ifdef MODULE
-        INIT_WORK(&wq_load, init_decoders);
-        schedule_work(&wq_load);
-#endif
-}
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index 1b8669b6d042..dd8237324c09 100644
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -1472,7 +1472,7 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
         /* input device for IR remote (and tx) */
         rdev = rc_allocate_device();
         if (!rdev)
-                goto failure;
+                goto exit_free_dev_rdev;
         itdev->rdev = rdev;
 
         ret = -ENODEV;
@@ -1498,12 +1498,12 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
         if (!pnp_port_valid(pdev, io_rsrc_no) ||
             pnp_port_len(pdev, io_rsrc_no) != dev_desc->io_region_size) {
                 dev_err(&pdev->dev, "IR PNP Port not valid!\n");
-                goto failure;
+                goto exit_free_dev_rdev;
         }
 
         if (!pnp_irq_valid(pdev, 0)) {
                 dev_err(&pdev->dev, "PNP IRQ not valid!\n");
-                goto failure;
+                goto exit_free_dev_rdev;
         }
 
         /* store resource values */
@@ -1591,29 +1591,29 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
         rdev->driver_name = ITE_DRIVER_NAME;
         rdev->map_name = RC_MAP_RC6_MCE;
 
+        ret = rc_register_device(rdev);
+        if (ret)
+                goto exit_free_dev_rdev;
+
         ret = -EBUSY;
         /* now claim resources */
         if (!request_region(itdev->cir_addr,
                                 dev_desc->io_region_size, ITE_DRIVER_NAME))
-                goto failure;
+                goto exit_unregister_device;
 
         if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED,
                         ITE_DRIVER_NAME, (void *)itdev))
-                goto failure2;
-
-        ret = rc_register_device(rdev);
-        if (ret)
-                goto failure3;
+                goto exit_release_cir_addr;
 
         ite_pr(KERN_NOTICE, "driver has been successfully loaded\n");
 
         return 0;
 
-failure3:
-        free_irq(itdev->cir_irq, itdev);
-failure2:
+exit_release_cir_addr:
         release_region(itdev->cir_addr, itdev->params.io_region_size);
-failure:
+exit_unregister_device:
+        rc_unregister_device(rdev);
+exit_free_dev_rdev:
         rc_free_device(rdev);
         kfree(itdev);
 
diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
index ab84d66c67c1..778661971aed 100644
--- a/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -88,6 +88,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
                         rc-tevii-nec.o \
                         rc-tivo.o \
                         rc-total-media-in-hand.o \
+                       rc-total-media-in-hand-02.o \
                         rc-trekstor.o \
                         rc-tt-1500.o \
                         rc-twinhan1027.o \
diff --git a/drivers/media/rc/keymaps/rc-total-media-in-hand-02.c b/drivers/media/rc/keymaps/rc-total-media-in-hand-02.c
new file mode 100644
index 000000000000..47270f72ebf0
--- /dev/null
+++ b/drivers/media/rc/keymaps/rc-total-media-in-hand-02.c
@@ -0,0 +1,86 @@
+/*
+ * Total Media In Hand_02 remote controller keytable for Mygica X8507
+ *
+ * Copyright (C) 2012 Alfredo J. Delaiti <alfredodelaiti@netscape.net>
+ *
+ *    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.,
+ *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <media/rc-map.h>
+#include <linux/module.h>
+
+
+static struct rc_map_table total_media_in_hand_02[] = {
+        { 0x0000, KEY_0 },
+        { 0x0001, KEY_1 },
+        { 0x0002, KEY_2 },
+        { 0x0003, KEY_3 },
+        { 0x0004, KEY_4 },
+        { 0x0005, KEY_5 },
+        { 0x0006, KEY_6 },
+        { 0x0007, KEY_7 },
+        { 0x0008, KEY_8 },
+        { 0x0009, KEY_9 },
+        { 0x000a, KEY_MUTE },
+        { 0x000b, KEY_STOP },                   /* Stop */
+        { 0x000c, KEY_POWER2 },                 /* Turn on/off application */
+        { 0x000d, KEY_OK },                     /* OK */
+        { 0x000e, KEY_CAMERA },                 /* Snapshot */
+        { 0x000f, KEY_ZOOM },                   /* Full Screen/Restore */
+        { 0x0010, KEY_RIGHT },                  /* Right arrow */
+        { 0x0011, KEY_LEFT },                   /* Left arrow */
+        { 0x0012, KEY_CHANNELUP },
+        { 0x0013, KEY_CHANNELDOWN },
+        { 0x0014, KEY_SHUFFLE },
+        { 0x0016, KEY_PAUSE },
+        { 0x0017, KEY_PLAY },                   /* Play */
+        { 0x001e, KEY_TIME },                   /* Time Shift */
+        { 0x001f, KEY_RECORD },
+        { 0x0020, KEY_UP },
+        { 0x0021, KEY_DOWN },
+        { 0x0025, KEY_POWER },                  /* Turn off computer */
+        { 0x0026, KEY_REWIND },                 /* FR << */
+        { 0x0027, KEY_FASTFORWARD },            /* FF >> */
+        { 0x0029, KEY_ESC },
+        { 0x002b, KEY_VOLUMEUP },
+        { 0x002c, KEY_VOLUMEDOWN },
+        { 0x002d, KEY_CHANNEL },                /* CH Surfing */
+        { 0x0038, KEY_VIDEO },                  /* TV/AV/S-Video/YPbPr */
+};
+
+static struct rc_map_list total_media_in_hand_02_map = {
+        .map = {
+                .scan    = total_media_in_hand_02,
+                .size    = ARRAY_SIZE(total_media_in_hand_02),
+                .rc_type = RC_TYPE_RC5,
+                .name    = RC_MAP_TOTAL_MEDIA_IN_HAND_02,
+        }
+};
+
+static int __init init_rc_map_total_media_in_hand_02(void)
+{
+        return rc_map_register(&total_media_in_hand_02_map);
+}
+
+static void __exit exit_rc_map_total_media_in_hand_02(void)
+{
+        rc_map_unregister(&total_media_in_hand_02_map);
+}
+
+module_init(init_rc_map_total_media_in_hand_02)
+module_exit(exit_rc_map_total_media_in_hand_02)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR(" Alfredo J. Delaiti <alfredodelaiti@netscape.net>");
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index 9afb9331217d..5b5b6e6f79e8 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -62,7 +62,6 @@
 #define MCE_PACKET_SIZE         4    /* Normal length of packet (without header) */
 #define MCE_IRDATA_HEADER       0x84 /* Actual header format is 0x80 + num_bytes */
 #define MCE_IRDATA_TRAILER      0x80 /* End of IR data */
-#define MCE_TX_HEADER_LENGTH    3    /* # of bytes in the initializing tx header */
 #define MCE_MAX_CHANNELS        2    /* Two transmitters, hardware dependent? */
 #define MCE_DEFAULT_TX_MASK     0x03 /* Vals: TX1=0x01, TX2=0x02, ALL=0x03 */
 #define MCE_PULSE_BIT           0x80 /* Pulse bit, MSB set == PULSE else SPACE */
@@ -291,7 +290,8 @@ static struct usb_device_id mceusb_dev_table[] = {
         /* Philips/Spinel plus IR transceiver for ASUS */
         { USB_DEVICE(VENDOR_PHILIPS, 0x2088) },
         /* Philips IR transceiver (Dell branded) */
-        { USB_DEVICE(VENDOR_PHILIPS, 0x2093) },
+        { USB_DEVICE(VENDOR_PHILIPS, 0x2093),
+          .driver_info = MCE_GEN2_TX_INV },
         /* Realtek MCE IR Receiver and card reader */
         { USB_DEVICE(VENDOR_REALTEK, 0x0161),
           .driver_info = MULTIFUNCTION },
@@ -365,7 +365,8 @@ static struct usb_device_id mceusb_dev_table[] = {
         /* Formosa Industrial Computing */
         { USB_DEVICE(VENDOR_FORMOSA, 0xe042) },
         /* Fintek eHome Infrared Transceiver (HP branded) */
-        { USB_DEVICE(VENDOR_FINTEK, 0x5168) },
+        { USB_DEVICE(VENDOR_FINTEK, 0x5168),
+          .driver_info = MCE_GEN2_TX_INV },
         /* Fintek eHome Infrared Transceiver */
         { USB_DEVICE(VENDOR_FINTEK, 0x0602) },
         /* Fintek eHome Infrared Transceiver (in the AOpen MP45) */
@@ -788,19 +789,19 @@ static void mce_flush_rx_buffer(struct mceusb_dev *ir, int size)
 static int mceusb_tx_ir(struct rc_dev *dev, unsigned *txbuf, unsigned count)
 {
         struct mceusb_dev *ir = dev->priv;
-        int i, ret = 0;
+        int i, length, ret = 0;
         int cmdcount = 0;
-        unsigned char *cmdbuf; /* MCE command buffer */
-
-        cmdbuf = kzalloc(sizeof(unsigned) * MCE_CMDBUF_SIZE, GFP_KERNEL);
-        if (!cmdbuf)
-                return -ENOMEM;
+        unsigned char cmdbuf[MCE_CMDBUF_SIZE];
 
         /* MCE tx init header */
         cmdbuf[cmdcount++] = MCE_CMD_PORT_IR;
         cmdbuf[cmdcount++] = MCE_CMD_SETIRTXPORTS;
         cmdbuf[cmdcount++] = ir->tx_mask;
 
+        /* Send the set TX ports command */
+        mce_async_out(ir, cmdbuf, cmdcount);
+        cmdcount = 0;
+
         /* Generate mce packet data */
         for (i = 0; (i < count) && (cmdcount < MCE_CMDBUF_SIZE); i++) {
                 txbuf[i] = txbuf[i] / MCE_TIME_UNIT;
@@ -809,8 +810,7 @@ static int mceusb_tx_ir(struct rc_dev *dev, unsigned *txbuf, unsigned count)
 
                         /* Insert mce packet header every 4th entry */
                         if ((cmdcount < MCE_CMDBUF_SIZE) &&
-                            (cmdcount - MCE_TX_HEADER_LENGTH) %
-                             MCE_CODE_LENGTH == 0)
+                            (cmdcount % MCE_CODE_LENGTH) == 0)
                                 cmdbuf[cmdcount++] = MCE_IRDATA_HEADER;
 
                         /* Insert mce packet data */
@@ -828,17 +828,16 @@ static int mceusb_tx_ir(struct rc_dev *dev, unsigned *txbuf, unsigned count)
                          (txbuf[i] -= MCE_MAX_PULSE_LENGTH));
         }
 
-        /* Fix packet length in last header */
-        cmdbuf[cmdcount - (cmdcount - MCE_TX_HEADER_LENGTH) % MCE_CODE_LENGTH] =
-                MCE_COMMAND_IRDATA + (cmdcount - MCE_TX_HEADER_LENGTH) %
-                MCE_CODE_LENGTH - 1;
-
         /* Check if we have room for the empty packet at the end */
         if (cmdcount >= MCE_CMDBUF_SIZE) {
                 ret = -EINVAL;
                 goto out;
         }
 
+        /* Fix packet length in last header */
+        length = cmdcount % MCE_CODE_LENGTH;
+        cmdbuf[cmdcount - length] -= MCE_CODE_LENGTH - length;
+
         /* All mce commands end with an empty packet (0x80) */
         cmdbuf[cmdcount++] = MCE_IRDATA_TRAILER;
 
@@ -846,7 +845,6 @@ static int mceusb_tx_ir(struct rc_dev *dev, unsigned *txbuf, unsigned count)
         mce_async_out(ir, cmdbuf, cmdcount);
 
 out:
-        kfree(cmdbuf);
         return ret ? ret : count;
 }
 
@@ -1121,16 +1119,13 @@ static void mceusb_gen1_init(struct mceusb_dev *ir)
         mce_async_out(ir, GET_REVISION, sizeof(GET_REVISION));
 
         kfree(data);
-};
+}
 
 static void mceusb_gen2_init(struct mceusb_dev *ir)
 {
         /* device resume */
         mce_async_out(ir, DEVICE_RESUME, sizeof(DEVICE_RESUME));
 
-        /* get hw/sw revision? */
-        mce_async_out(ir, GET_REVISION, sizeof(GET_REVISION));
-
         /* get wake version (protocol, key, address) */
         mce_async_out(ir, GET_WAKEVERSION, sizeof(GET_WAKEVERSION));
 
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index b8aa9abb31ff..40125d779049 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -986,25 +986,25 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
         /* input device for IR remote (and tx) */
         rdev = rc_allocate_device();
         if (!rdev)
-                goto failure;
+                goto exit_free_dev_rdev;
 
         ret = -ENODEV;
         /* validate pnp resources */
         if (!pnp_port_valid(pdev, 0) ||
             pnp_port_len(pdev, 0) < CIR_IOREG_LENGTH) {
                 dev_err(&pdev->dev, "IR PNP Port not valid!\n");
-                goto failure;
+                goto exit_free_dev_rdev;
         }
 
         if (!pnp_irq_valid(pdev, 0)) {
                 dev_err(&pdev->dev, "PNP IRQ not valid!\n");
-                goto failure;
+                goto exit_free_dev_rdev;
         }
 
         if (!pnp_port_valid(pdev, 1) ||
             pnp_port_len(pdev, 1) < CIR_IOREG_LENGTH) {
                 dev_err(&pdev->dev, "Wake PNP Port not valid!\n");
-                goto failure;
+                goto exit_free_dev_rdev;
         }
 
         nvt->cir_addr = pnp_port_start(pdev, 0);
@@ -1027,7 +1027,7 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
 
         ret = nvt_hw_detect(nvt);
         if (ret)
-                goto failure;
+                goto exit_free_dev_rdev;
 
         /* Initialize CIR & CIR Wake Logical Devices */
         nvt_efm_enable(nvt);
@@ -1065,31 +1065,32 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
         /* tx bits */
         rdev->tx_resolution = XYZ;
 #endif
+        nvt->rdev = rdev;
+
+        ret = rc_register_device(rdev);
+        if (ret)
+                goto exit_free_dev_rdev;
 
         ret = -EBUSY;
         /* now claim resources */
         if (!request_region(nvt->cir_addr,
                             CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
-                goto failure;
+                goto exit_unregister_device;
 
         if (request_irq(nvt->cir_irq, nvt_cir_isr, IRQF_SHARED,
                         NVT_DRIVER_NAME, (void *)nvt))
-                goto failure2;
+                goto exit_release_cir_addr;
 
         if (!request_region(nvt->cir_wake_addr,
                             CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
-                goto failure3;
+                goto exit_free_irq;
 
         if (request_irq(nvt->cir_wake_irq, nvt_cir_wake_isr, IRQF_SHARED,
                         NVT_DRIVER_NAME, (void *)nvt))
-                goto failure4;
-
-        ret = rc_register_device(rdev);
-        if (ret)
-                goto failure5;
+                goto exit_release_cir_wake_addr;
 
         device_init_wakeup(&pdev->dev, true);
-        nvt->rdev = rdev;
+
         nvt_pr(KERN_NOTICE, "driver has been successfully loaded\n");
         if (debug) {
                 cir_dump_regs(nvt);
@@ -1098,15 +1099,15 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
 
         return 0;
 
-failure5:
-        free_irq(nvt->cir_wake_irq, nvt);
-failure4:
+exit_release_cir_wake_addr:
         release_region(nvt->cir_wake_addr, CIR_IOREG_LENGTH);
-failure3:
+exit_free_irq:
         free_irq(nvt->cir_irq, nvt);
-failure2:
+exit_release_cir_addr:
         release_region(nvt->cir_addr, CIR_IOREG_LENGTH);
-failure:
+exit_unregister_device:
+        rc_unregister_device(rdev);
+exit_free_dev_rdev:
         rc_free_device(rdev);
         kfree(nvt);
 
diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
index 96f0a8bb39ea..5d87287ed372 100644
--- a/drivers/media/rc/rc-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
@@ -165,56 +165,56 @@ void ir_raw_init(void);
 
 /* from ir-nec-decoder.c */
 #ifdef CONFIG_IR_NEC_DECODER_MODULE
-#define load_nec_decode()       request_module("ir-nec-decoder")
+#define load_nec_decode()       request_module_nowait("ir-nec-decoder")
 #else
 static inline void load_nec_decode(void) { }
 #endif
 
 /* from ir-rc5-decoder.c */
 #ifdef CONFIG_IR_RC5_DECODER_MODULE
-#define load_rc5_decode()       request_module("ir-rc5-decoder")
+#define load_rc5_decode()       request_module_nowait("ir-rc5-decoder")
 #else
 static inline void load_rc5_decode(void) { }
 #endif
 
 /* from ir-rc6-decoder.c */
 #ifdef CONFIG_IR_RC6_DECODER_MODULE
-#define load_rc6_decode()       request_module("ir-rc6-decoder")
+#define load_rc6_decode()       request_module_nowait("ir-rc6-decoder")
 #else
 static inline void load_rc6_decode(void) { }
 #endif
 
 /* from ir-jvc-decoder.c */
 #ifdef CONFIG_IR_JVC_DECODER_MODULE
-#define load_jvc_decode()       request_module("ir-jvc-decoder")
+#define load_jvc_decode()       request_module_nowait("ir-jvc-decoder")
 #else
 static inline void load_jvc_decode(void) { }
 #endif
 
 /* from ir-sony-decoder.c */
 #ifdef CONFIG_IR_SONY_DECODER_MODULE
-#define load_sony_decode()      request_module("ir-sony-decoder")
+#define load_sony_decode()      request_module_nowait("ir-sony-decoder")
 #else
 static inline void load_sony_decode(void) { }
 #endif
 
 /* from ir-sanyo-decoder.c */
 #ifdef CONFIG_IR_SANYO_DECODER_MODULE
-#define load_sanyo_decode()     request_module("ir-sanyo-decoder")
+#define load_sanyo_decode()     request_module_nowait("ir-sanyo-decoder")
 #else
 static inline void load_sanyo_decode(void) { }
 #endif
 
 /* from ir-mce_kbd-decoder.c */
 #ifdef CONFIG_IR_MCE_KBD_DECODER_MODULE
-#define load_mce_kbd_decode()   request_module("ir-mce_kbd-decoder")
+#define load_mce_kbd_decode()   request_module_nowait("ir-mce_kbd-decoder")
 #else
 static inline void load_mce_kbd_decode(void) { }
 #endif
 
 /* from ir-lirc-codec.c */
 #ifdef CONFIG_IR_LIRC_CODEC_MODULE
-#define load_lirc_codec()       request_module("ir-lirc-codec")
+#define load_lirc_codec()       request_module_nowait("ir-lirc-codec")
 #else
 static inline void load_lirc_codec(void) { }
 #endif
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 601d1ac1c688..759a40a42eaa 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -789,8 +789,10 @@ static ssize_t show_protocols(struct device *device,
         } else if (dev->raw) {
                 enabled = dev->raw->enabled_protocols;
                 allowed = ir_raw_get_allowed_protocols();
-        } else
+        } else {
+                mutex_unlock(&dev->lock);
                 return -ENODEV;
+        }
 
         IR_dprintk(1, "allowed - 0x%llx, enabled - 0x%llx\n",
                    (long long)allowed,
@@ -890,7 +892,8 @@ static ssize_t store_protocols(struct device *device,
 
                 if (i == ARRAY_SIZE(proto_names)) {
                         IR_dprintk(1, "Unknown protocol: '%s'\n", tmp);
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        goto out;
                 }
 
                 count++;
diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
index 1800326f93e6..1b37fe2779f8 100644
--- a/drivers/media/rc/redrat3.c
+++ b/drivers/media/rc/redrat3.c
@@ -195,9 +195,6 @@ struct redrat3_dev {
         dma_addr_t dma_in;
         dma_addr_t dma_out;
 
-        /* locks this structure */
-        struct mutex lock;
-
         /* rx signal timeout timer */
         struct timer_list rx_timeout;
         u32 hw_timeout;
@@ -922,8 +919,7 @@ static int redrat3_transmit_ir(struct rc_dev *rcdev, unsigned *txbuf,
                 return -EAGAIN;
         }
 
-        if (count > (RR3_DRIVER_MAXLENS * 2))
-                return -EINVAL;
+        count = min_t(unsigned, count, RR3_MAX_SIG_SIZE - RR3_TX_TRAILER_LEN);
 
         /* rr3 will disable rc detector on transmit */
         rr3->det_enabled = false;
@@ -936,24 +932,22 @@ static int redrat3_transmit_ir(struct rc_dev *rcdev, unsigned *txbuf,
         }
 
         for (i = 0; i < count; i++) {
+                cur_sample_len = redrat3_us_to_len(txbuf[i]);
                 for (lencheck = 0; lencheck < curlencheck; lencheck++) {
-                        cur_sample_len = redrat3_us_to_len(txbuf[i]);
                         if (sample_lens[lencheck] == cur_sample_len)
                                 break;
                 }
                 if (lencheck == curlencheck) {
-                        cur_sample_len = redrat3_us_to_len(txbuf[i]);
                         rr3_dbg(dev, "txbuf[%d]=%u, pos %d, enc %u\n",
                                 i, txbuf[i], curlencheck, cur_sample_len);
-                        if (curlencheck < 255) {
+                        if (curlencheck < RR3_DRIVER_MAXLENS) {
                                 /* now convert the value to a proper
                                  * rr3 value.. */
                                 sample_lens[curlencheck] = cur_sample_len;
                                 curlencheck++;
                         } else {
-                                dev_err(dev, "signal too long\n");
-                                ret = -EINVAL;
-                                goto out;
+                                count = i - 1;
+                                break;
                         }
                 }
         }
@@ -1087,6 +1081,7 @@ static struct rc_dev *redrat3_init_rc_dev(struct redrat3_dev *rr3)
         rc->tx_ir = redrat3_transmit_ir;
         rc->s_tx_carrier = redrat3_set_tx_carrier;
         rc->driver_name = DRIVER_NAME;
+        rc->rx_resolution = US_TO_NS(2);
         rc->map_name = RC_MAP_HAUPPAUGE;
 
         ret = rc_register_device(rc);
@@ -1202,7 +1197,6 @@ static int redrat3_dev_probe(struct usb_interface *intf,
                           rr3->bulk_out_buf, ep_out->wMaxPacketSize,
                           (usb_complete_t)redrat3_write_bulk_callback, rr3);
 
-        mutex_init(&rr3->lock);
         rr3->udev = udev;
 
         redrat3_reset(rr3);
diff --git a/drivers/media/rc/ttusbir.c b/drivers/media/rc/ttusbir.c
index 78be8a914225..cf0d47f57fb2 100644
--- a/drivers/media/rc/ttusbir.c
+++ b/drivers/media/rc/ttusbir.c
@@ -213,19 +213,20 @@ static int ttusbir_probe(struct usb_interface *intf,
 
         /* find the correct alt setting */
         for (i = 0; i < intf->num_altsetting && altsetting == -1; i++) {
-                int bulk_out_endp = -1, iso_in_endp = -1;
+                int max_packet, bulk_out_endp = -1, iso_in_endp = -1;
 
                 idesc = &intf->altsetting[i].desc;
 
                 for (j = 0; j < idesc->bNumEndpoints; j++) {
                         desc = &intf->altsetting[i].endpoint[j].desc;
+                        max_packet = le16_to_cpu(desc->wMaxPacketSize);
                         if (usb_endpoint_dir_in(desc) &&
                                         usb_endpoint_xfer_isoc(desc) &&
-                                        desc->wMaxPacketSize == 0x10)
+                                        max_packet == 0x10)
                                 iso_in_endp = j;
                         else if (usb_endpoint_dir_out(desc) &&
                                         usb_endpoint_xfer_bulk(desc) &&
-                                        desc->wMaxPacketSize == 0x20)
+                                        max_packet == 0x20)
                                 bulk_out_endp = j;
 
                         if (bulk_out_endp != -1 && iso_in_endp != -1) {
@@ -408,9 +409,8 @@ static int ttusbir_resume(struct usb_interface *intf)
         struct ttusbir *tt = usb_get_intfdata(intf);
         int i, rc;
 
-        led_classdev_resume(&tt->led);
         tt->is_led_on = true;
-        ttusbir_set_led(tt);
+        led_classdev_resume(&tt->led);
 
         for (i = 0; i < NUM_URBS; i++) {
                 rc = usb_submit_urb(tt->urb[i], GFP_KERNEL);
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
index 930c61499037..535a18dccbd0 100644
--- a/drivers/media/rc/winbond-cir.c
+++ b/drivers/media/rc/winbond-cir.c
@@ -154,6 +154,8 @@
 #define WBCIR_CNTR_R            0x02
 /* Invert TX */
 #define WBCIR_IRTX_INV          0x04
+/* Receiver oversampling */
+#define WBCIR_RX_T_OV           0x40
 
 /* Valid banks for the SP3 UART */
 enum wbcir_bank {
@@ -394,7 +396,8 @@ wbcir_irq_rx(struct wbcir_data *data, struct pnp_dev *device)
                 if (data->rxstate == WBCIR_RXSTATE_ERROR)
                         continue;
 
-                duration = ((irdata & 0x7F) + 1) * 2;
+                duration = ((irdata & 0x7F) + 1) *
+                        (data->carrier_report_enabled ? 2 : 10);
                 rawir.pulse = irdata & 0x80 ? false : true;
                 rawir.duration = US_TO_NS(duration);
 
@@ -550,6 +553,17 @@ wbcir_set_carrier_report(struct rc_dev *dev, int enable)
                 wbcir_set_bits(data->ebase + WBCIR_REG_ECEIR_CCTL,
                                 WBCIR_CNTR_EN, WBCIR_CNTR_EN | WBCIR_CNTR_R);
 
+        /* Set a higher sampling resolution if carrier reports are enabled */
+        wbcir_select_bank(data, WBCIR_BANK_2);
+        data->dev->rx_resolution = US_TO_NS(enable ? 2 : 10);
+        outb(enable ? 0x03 : 0x0f, data->sbase + WBCIR_REG_SP3_BGDL);
+        outb(0x00, data->sbase + WBCIR_REG_SP3_BGDH);
+
+        /* Enable oversampling if carrier reports are enabled */
+        wbcir_select_bank(data, WBCIR_BANK_7);
+        wbcir_set_bits(data->sbase + WBCIR_REG_SP3_RCCFG,
+                                enable ? WBCIR_RX_T_OV : 0, WBCIR_RX_T_OV);
+
         data->carrier_report_enabled = enable;
         spin_unlock_irqrestore(&data->spinlock, flags);
 
@@ -931,8 +945,8 @@ wbcir_init_hw(struct wbcir_data *data)
         /* prescaler 1.0, tx/rx fifo lvl 16 */
         outb(0x30, data->sbase + WBCIR_REG_SP3_EXCR2);
 
-        /* Set baud divisor to sample every 2 ns */
-        outb(0x03, data->sbase + WBCIR_REG_SP3_BGDL);
+        /* Set baud divisor to sample every 10 us */
+        outb(0x0f, data->sbase + WBCIR_REG_SP3_BGDL);
         outb(0x00, data->sbase + WBCIR_REG_SP3_BGDH);
 
         /* Set CEIR mode */
@@ -941,12 +955,9 @@ wbcir_init_hw(struct wbcir_data *data)
         inb(data->sbase + WBCIR_REG_SP3_LSR); /* Clear LSR */
         inb(data->sbase + WBCIR_REG_SP3_MSR); /* Clear MSR */
 
-        /*
-         * Disable RX demod, enable run-length enc/dec, set freq span and
-         * enable over-sampling
-         */
+        /* Disable RX demod, enable run-length enc/dec, set freq span */
         wbcir_select_bank(data, WBCIR_BANK_7);
-        outb(0xd0, data->sbase + WBCIR_REG_SP3_RCCFG);
+        outb(0x90, data->sbase + WBCIR_REG_SP3_RCCFG);
 
         /* Disable timer */
         wbcir_select_bank(data, WBCIR_BANK_4);
@@ -1093,11 +1104,15 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
         data->dev->rx_resolution = US_TO_NS(2);
         data->dev->allowed_protos = RC_BIT_ALL;
 
+        err = rc_register_device(data->dev);
+        if (err)
+                goto exit_free_rc;
+
         if (!request_region(data->wbase, WAKEUP_IOMEM_LEN, DRVNAME)) {
                 dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
                         data->wbase, data->wbase + WAKEUP_IOMEM_LEN - 1);
                 err = -EBUSY;
-                goto exit_free_rc;
+                goto exit_unregister_device;
         }
 
         if (!request_region(data->ebase, EHFUNC_IOMEM_LEN, DRVNAME)) {
@@ -1122,24 +1137,20 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
                 goto exit_release_sbase;
         }
 
-        err = rc_register_device(data->dev);
-        if (err)
-                goto exit_free_irq;
-
         device_init_wakeup(&device->dev, 1);
 
         wbcir_init_hw(data);
 
         return 0;
 
-exit_free_irq:
-        free_irq(data->irq, device);
 exit_release_sbase:
         release_region(data->sbase, SP_IOMEM_LEN);
 exit_release_ebase:
         release_region(data->ebase, EHFUNC_IOMEM_LEN);
 exit_release_wbase:
         release_region(data->wbase, WAKEUP_IOMEM_LEN);
+exit_unregister_device:
+        rc_unregister_device(data->dev);
 exit_free_rc:
         rc_free_device(data->dev);
 exit_unregister_led: