]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] media/radio: fix querycap
authorHans Verkuil <hans.verkuil@cisco.com>
Mon, 24 Nov 2014 09:37:24 +0000 (06:37 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 2 Dec 2014 13:30:55 +0000 (11:30 -0200)
Querycap should set the device_caps field.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/radio/radio-wl1273.c
drivers/media/radio/wl128x/fmdrv_v4l2.c

index 9cf6731fb816b4fe2bb27c6ce06f37658995faf3..284f789265e0bfc0466321df2b52f8b64f38b3d4 100644 (file)
@@ -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;
 }
index b55012c11842cfd50e8062ff8477df07f010552d..a5bd3f674bbdba19be2697c247c8276ed51f9d17 100644 (file)
@@ -198,10 +198,12 @@ static int fm_v4l2_vidioc_querycap(struct file *file, void *priv,
        strlcpy(capability->card, FM_DRV_CARD_SHORT_NAME,
                        sizeof(capability->card));
        sprintf(capability->bus_info, "UART");
-       capability->capabilities = V4L2_CAP_HW_FREQ_SEEK | V4L2_CAP_TUNER |
+       capability->device_caps = V4L2_CAP_HW_FREQ_SEEK | V4L2_CAP_TUNER |
                V4L2_CAP_RADIO | V4L2_CAP_MODULATOR |
                V4L2_CAP_AUDIO | V4L2_CAP_READWRITE |
                V4L2_CAP_RDS_CAPTURE;
+       capability->capabilities = capability->device_caps |
+               V4L2_CAP_DEVICE_CAPS;
 
        return 0;
 }