Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / media / radio / radio-wl1273.c

diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index fd2281c4a7845391eebaf6de34b354e290e47dd8..b8f36445516b167d222103d58d22fa819df521a5 100644 (file)
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -1279,10 +1279,12 @@ static int wl1273_fm_vidioc_querycap(struct file *file, void *priv,
        strlcpy(capability->bus_info, radio->bus_type,
                sizeof(capability->bus_info));
 
-       capability->capabilities = V4L2_CAP_HW_FREQ_SEEK |
+       capability->device_caps = V4L2_CAP_HW_FREQ_SEEK |
                V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_AUDIO |
                V4L2_CAP_RDS_CAPTURE | V4L2_CAP_MODULATOR |
                V4L2_CAP_RDS_OUTPUT;
+       capability->capabilities = capability->device_caps |
+               V4L2_CAP_DEVICE_CAPS;
 
        return 0;
 }