Merge tag 'v3.6-rc3' into staging/for_v3.7

Linux 3.6-rc3

* tag 'v3.6-rc3': (764 commits)
  Linux 3.6-rc3
  task_work: add a scheduling point in task_work_run()
  fs: fix fs/namei.c kernel-doc warnings
  eventpoll: use-after-possible-free in epoll_create1()
  vfio: grab vfio_device reference *before* exposing the sucker via fd_install()
  vfio: get rid of vfio_device_put()/vfio_group_get_device* races
  vfio: get rid of open-coding kref_put_mutex
  introduce kref_put_mutex()
  vfio: don't dereference after kfree...
  fbcon: fix race condition between console lock and cursor timer (v1.1)
  mm: compaction: Abort async compaction if locks are contended or taking too long
  mm: have order > 0 compaction start near a pageblock with free pages
  rapidio/tsi721: fix unused variable compiler warning
  rapidio/tsi721: fix inbound doorbell interrupt handling
  drivers/rtc/rtc-rs5c348.c: fix hour decoding in 12-hour mode
  mm: correct page->pfmemalloc to fix deactivate_slab regression
  drivers/rtc/rtc-pcf2123.c: initialize dynamic sysfs attributes
  mm/compaction.c: fix deferring compaction mistake
  drivers/misc/sgi-xp/xpc_uv.c: SGI XPC fails to load when cpu 0 is out of IRQ resources
  string: do not export memweight() to userspace
  ...

12 files changed, 171 insertions, 147 deletions

diff --git a/drivers/media/platform/mem2mem_testdev.c b/drivers/media/platform/mem2mem_testdev.c
index 51b6dd4ddbf..0b496f39a65 100644
--- a/drivers/media/platform/mem2mem_testdev.c
+++ b/drivers/media/platform/mem2mem_testdev.c
@@ -431,7 +431,7 @@ 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);
         strlcpy(cap->bus_info, MEM2MEM_NAME, sizeof(cap->bus_info));
-        cap->capabilities = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
+        cap->device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
         cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
index d0b6bb50763..72ded29728b 100644
--- a/drivers/media/radio/radio-shark.c
+++ b/drivers/media/radio/radio-shark.c
@@ -35,6 +35,11 @@
 #include <media/v4l2-device.h>
 #include <sound/tea575x-tuner.h>
 
+#if defined(CONFIG_LEDS_CLASS) || \
+    (defined(CONFIG_LEDS_CLASS_MODULE) && defined(CONFIG_RADIO_SHARK_MODULE))
+#define SHARK_USE_LEDS 1
+#endif
+
 /*
  * Version Information
  */
@@ -56,44 +61,18 @@ MODULE_LICENSE("GPL");
 
 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;
 
+#ifdef SHARK_USE_LEDS
         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;
+#endif
 
         u8 *transfer_buffer;
         u32 last_val;
@@ -175,20 +154,13 @@ static struct snd_tea575x_ops shark_tea_ops = {
         .read_val  = shark_read_val,
 };
 
+#ifdef SHARK_USE_LEDS
 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;
@@ -208,8 +180,6 @@ static void shark_led_work(struct work_struct *work)
                         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,
@@ -245,19 +215,78 @@ static void shark_led_set_red(struct led_classdev *led_cdev,
         schedule_work(&shark->led_work);
 }
 
+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,
+        },
+};
+
+static int shark_register_leds(struct shark_device *shark, struct device *dev)
+{
+        int i, retval;
+
+        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];
+                retval = led_classdev_register(dev, &shark->leds[i]);
+                if (retval) {
+                        v4l2_err(&shark->v4l2_dev,
+                                 "couldn't register led: %s\n",
+                                 shark->led_names[i]);
+                        return retval;
+                }
+        }
+        return 0;
+}
+
+static void shark_unregister_leds(struct shark_device *shark)
+{
+        int i;
+
+        for (i = 0; i < NO_LEDS; i++)
+                led_classdev_unregister(&shark->leds[i]);
+
+        cancel_work_sync(&shark->led_work);
+}
+#else
+static int shark_register_leds(struct shark_device *shark, struct device *dev)
+{
+        v4l2_warn(&shark->v4l2_dev,
+                  "CONFIG_LED_CLASS not enabled, LED support disabled\n");
+        return 0;
+}
+static inline void shark_unregister_leds(struct shark_device *shark) { }
+#endif
+
 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]);
+        shark_unregister_leds(shark);
 
         v4l2_device_put(&shark->v4l2_dev);
 }
@@ -266,7 +295,6 @@ 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);
@@ -276,7 +304,7 @@ static int usb_shark_probe(struct usb_interface *intf,
                            const struct usb_device_id *id)
 {
         struct shark_device *shark;
-        int i, retval = -ENOMEM;
+        int retval = -ENOMEM;
 
         shark = kzalloc(sizeof(struct shark_device), GFP_KERNEL);
         if (!shark)
@@ -286,17 +314,13 @@ static int usb_shark_probe(struct usb_interface *intf,
         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);
+        v4l2_device_set_name(&shark->v4l2_dev, DRV_NAME, &shark_instance);
+
+        retval = shark_register_leds(shark, &intf->dev);
+        if (retval)
+                goto err_reg_leds;
 
         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");
@@ -320,32 +344,13 @@ static int usb_shark_probe(struct usb_interface *intf,
                 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:
+        shark_unregister_leds(shark);
+err_reg_leds:
         kfree(shark->transfer_buffer);
 err_alloc_buffer:
         kfree(shark);
diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
index 90aecfb0ff9..7c730a0277a 100644
--- a/drivers/media/radio/radio-shark2.c
+++ b/drivers/media/radio/radio-shark2.c
@@ -35,6 +35,11 @@
 #include <media/v4l2-device.h>
 #include "radio-tea5777.h"
 
+#if defined(CONFIG_LEDS_CLASS) || \
+    (defined(CONFIG_LEDS_CLASS_MODULE) && defined(CONFIG_RADIO_SHARK2_MODULE))
+#define SHARK_USE_LEDS 1
+#endif
+
 MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
 MODULE_DESCRIPTION("Griffin radioSHARK2, USB radio receiver driver");
 MODULE_LICENSE("GPL");
@@ -43,7 +48,6 @@ 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
 
@@ -54,36 +58,18 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 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;
 
+#ifdef SHARK_USE_LEDS
         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;
+#endif
 
         u8 *transfer_buffer;
 };
@@ -156,18 +142,12 @@ static struct radio_tea5777_ops shark_tea_ops = {
         .read_reg  = shark_read_reg,
 };
 
+#ifdef SHARK_USE_LEDS
 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))
@@ -186,8 +166,6 @@ static void shark_led_work(struct work_struct *work)
                         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,
@@ -212,19 +190,72 @@ static void shark_led_set_red(struct led_classdev *led_cdev,
         schedule_work(&shark->led_work);
 }
 
+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,
+        },
+};
+
+static int shark_register_leds(struct shark_device *shark, struct device *dev)
+{
+        int i, retval;
+
+        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];
+                retval = led_classdev_register(dev, &shark->leds[i]);
+                if (retval) {
+                        v4l2_err(&shark->v4l2_dev,
+                                 "couldn't register led: %s\n",
+                                 shark->led_names[i]);
+                        return retval;
+                }
+        }
+        return 0;
+}
+
+static void shark_unregister_leds(struct shark_device *shark)
+{
+        int i;
+
+        for (i = 0; i < NO_LEDS; i++)
+                led_classdev_unregister(&shark->leds[i]);
+
+        cancel_work_sync(&shark->led_work);
+}
+#else
+static int shark_register_leds(struct shark_device *shark, struct device *dev)
+{
+        v4l2_warn(&shark->v4l2_dev,
+                  "CONFIG_LED_CLASS not enabled, LED support disabled\n");
+        return 0;
+}
+static inline void shark_unregister_leds(struct shark_device *shark) { }
+#endif
+
 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]);
+        shark_unregister_leds(shark);
 
         v4l2_device_put(&shark->v4l2_dev);
 }
@@ -233,7 +264,6 @@ 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);
@@ -243,7 +273,7 @@ static int usb_shark_probe(struct usb_interface *intf,
                            const struct usb_device_id *id)
 {
         struct shark_device *shark;
-        int i, retval = -ENOMEM;
+        int retval = -ENOMEM;
 
         shark = kzalloc(sizeof(struct shark_device), GFP_KERNEL);
         if (!shark)
@@ -253,17 +283,13 @@ static int usb_shark_probe(struct usb_interface *intf,
         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);
+        v4l2_device_set_name(&shark->v4l2_dev, DRV_NAME, &shark_instance);
+
+        retval = shark_register_leds(shark, &intf->dev);
+        if (retval)
+                goto err_reg_leds;
 
         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");
@@ -287,32 +313,13 @@ static int usb_shark_probe(struct usb_interface *intf,
                 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:
+        shark_unregister_leds(shark);
+err_reg_leds:
         kfree(shark->transfer_buffer);
 err_alloc_buffer:
         kfree(shark);
diff --git a/drivers/media/radio/si470x/radio-si470x-common.c b/drivers/media/radio/si470x/radio-si470x-common.c
index 9e38132afec..9bb65e170d9 100644
--- a/drivers/media/radio/si470x/radio-si470x-common.c
+++ b/drivers/media/radio/si470x/radio-si470x-common.c
@@ -151,6 +151,7 @@ static const struct v4l2_frequency_band bands[] = {
                 .index = 0,
                 .capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
                             V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |
+                            V4L2_TUNER_CAP_FREQ_BANDS |
                             V4L2_TUNER_CAP_HWSEEK_BOUNDED |
                             V4L2_TUNER_CAP_HWSEEK_WRAP,
                 .rangelow   =  87500 * 16,
@@ -162,6 +163,7 @@ static const struct v4l2_frequency_band bands[] = {
                 .index = 1,
                 .capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
                             V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |
+                            V4L2_TUNER_CAP_FREQ_BANDS |
                             V4L2_TUNER_CAP_HWSEEK_BOUNDED |
                             V4L2_TUNER_CAP_HWSEEK_WRAP,
                 .rangelow   =  76000 * 16,
@@ -173,6 +175,7 @@ static const struct v4l2_frequency_band bands[] = {
                 .index = 2,
                 .capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
                             V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |
+                            V4L2_TUNER_CAP_FREQ_BANDS |
                             V4L2_TUNER_CAP_HWSEEK_BOUNDED |
                             V4L2_TUNER_CAP_HWSEEK_WRAP,
                 .rangelow   =  76000 * 16,
diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c
index 643a6ff7c5d..f867f04cccc 100644
--- a/drivers/media/radio/si470x/radio-si470x-i2c.c
+++ b/drivers/media/radio/si470x/radio-si470x-i2c.c
@@ -225,8 +225,9 @@ int si470x_vidioc_querycap(struct file *file, void *priv,
 {
         strlcpy(capability->driver, DRIVER_NAME, sizeof(capability->driver));
         strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card));
-        capability->capabilities = V4L2_CAP_HW_FREQ_SEEK |
-                V4L2_CAP_TUNER | V4L2_CAP_RADIO;
+        capability->device_caps = V4L2_CAP_HW_FREQ_SEEK | V4L2_CAP_READWRITE |
+                V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_RDS_CAPTURE;
+        capability->capabilities = capability->device_caps | V4L2_CAP_DEVICE_CAPS;
 
         return 0;
 }
diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c
index 146be4263ea..be076f7181e 100644
--- a/drivers/media/radio/si470x/radio-si470x-usb.c
+++ b/drivers/media/radio/si470x/radio-si470x-usb.c
@@ -531,7 +531,7 @@ int si470x_vidioc_querycap(struct file *file, void *priv,
         strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card));
         usb_make_path(radio->usbdev, capability->bus_info,
                         sizeof(capability->bus_info));
-        capability->device_caps = V4L2_CAP_HW_FREQ_SEEK |
+        capability->device_caps = V4L2_CAP_HW_FREQ_SEEK | V4L2_CAP_READWRITE |
                 V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_RDS_CAPTURE;
         capability->capabilities = capability->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 4682a5a3c3e..02ce43c7914 100644
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -261,6 +261,7 @@ config IR_WINBOND_CIR
 
 config IR_IGUANA
         tristate "IguanaWorks USB IR Transceiver"
+        depends on USB_ARCH_HAS_HCD
         depends on RC_CORE
         select USB
         ---help---
diff --git a/drivers/media/usb/gspca/jl2005bcd.c b/drivers/media/usb/gspca/jl2005bcd.c
index cf9d9fca5b8..234777116e5 100644
--- a/drivers/media/usb/gspca/jl2005bcd.c
+++ b/drivers/media/usb/gspca/jl2005bcd.c
@@ -512,7 +512,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x0979, 0x0227)},
         {}
 };
diff --git a/drivers/media/usb/gspca/spca506.c b/drivers/media/usb/gspca/spca506.c
index 969bb5a4cd9..bab01c86c31 100644
--- a/drivers/media/usb/gspca/spca506.c
+++ b/drivers/media/usb/gspca/spca506.c
@@ -579,7 +579,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const struct usb_device_id device_table[] __devinitconst = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x06e1, 0xa190)},
 /*fixme: may be IntelPCCameraPro BRIDGE_SPCA505
         {USB_DEVICE(0x0733, 0x0430)}, */
diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
index 664e460f247..aac622200e9 100644
--- a/drivers/media/usb/siano/smsusb.c
+++ b/drivers/media/usb/siano/smsusb.c
@@ -481,7 +481,7 @@ static int smsusb_resume(struct usb_interface *intf)
         return 0;
 }
 
-static const struct usb_device_id smsusb_id_table[] __devinitconst = {
+static const struct usb_device_id smsusb_id_table[] = {
         { USB_DEVICE(0x187f, 0x0010),
                 .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
         { USB_DEVICE(0x187f, 0x0100),
diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
index 9288fbd5001..5577381b5bf 100644
--- a/drivers/media/usb/uvc/uvc_queue.c
+++ b/drivers/media/usb/uvc/uvc_queue.c
@@ -338,6 +338,7 @@ struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue,
         if ((queue->flags & UVC_QUEUE_DROP_CORRUPTED) && buf->error) {
                 buf->error = 0;
                 buf->state = UVC_BUF_STATE_QUEUED;
+                buf->bytesused = 0;
                 vb2_set_plane_payload(&buf->buf, 0, 0);
                 return buf;
         }
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index c3b7b5f59b3..6bc47fc82fe 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -402,8 +402,10 @@ static void v4l_print_hw_freq_seek(const void *arg, bool write_only)
 {
         const struct v4l2_hw_freq_seek *p = arg;
 
-        pr_cont("tuner=%u, type=%u, seek_upward=%u, wrap_around=%u, spacing=%u\n",
-                p->tuner, p->type, p->seek_upward, p->wrap_around, p->spacing);
+        pr_cont("tuner=%u, type=%u, seek_upward=%u, wrap_around=%u, spacing=%u, "
+                "rangelow=%u, rangehigh=%u\n",
+                p->tuner, p->type, p->seek_upward, p->wrap_around, p->spacing,
+                p->rangelow, p->rangehigh);
 }
 
 static void v4l_print_requestbuffers(const void *arg, bool write_only)
@@ -1853,6 +1855,8 @@ static int v4l_enum_freq_bands(const struct v4l2_ioctl_ops *ops,
                         .type = type,
                 };
 
+                if (p->index)
+                        return -EINVAL;
                 err = ops->vidioc_g_tuner(file, fh, &t);
                 if (err)
                         return err;
@@ -1870,6 +1874,8 @@ static int v4l_enum_freq_bands(const struct v4l2_ioctl_ops *ops,
 
                 if (type != V4L2_TUNER_RADIO)
                         return -EINVAL;
+                if (p->index)
+                        return -EINVAL;
                 err = ops->vidioc_g_modulator(file, fh, &m);
                 if (err)
                         return err;