lkml.org 
[lkml]   [2018]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 02/13] [media] hackrf: group device capabilities
    Date
    From: Gustavo Padovan <gustavo.padovan@collabora.com>

    Instead of putting V4L2_CAP_STREAMING and V4L2_CAP_READWRITE
    everywhere, set device_caps earlier with these values.

    Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
    ---
    drivers/media/usb/hackrf/hackrf.c | 11 ++++-------
    1 file changed, 4 insertions(+), 7 deletions(-)

    diff --git a/drivers/media/usb/hackrf/hackrf.c b/drivers/media/usb/hackrf/hackrf.c
    index 7eb53517a82f..6d692fb3e8dd 100644
    --- a/drivers/media/usb/hackrf/hackrf.c
    +++ b/drivers/media/usb/hackrf/hackrf.c
    @@ -909,18 +909,15 @@ static int hackrf_querycap(struct file *file, void *fh,

    dev_dbg(&intf->dev, "\n");

    + cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
    if (vdev->vfl_dir == VFL_DIR_RX)
    - cap->device_caps = V4L2_CAP_SDR_CAPTURE | V4L2_CAP_TUNER |
    - V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
    -
    + cap->device_caps |= V4L2_CAP_SDR_CAPTURE | V4L2_CAP_TUNER;
    else
    - cap->device_caps = V4L2_CAP_SDR_OUTPUT | V4L2_CAP_MODULATOR |
    - V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
    + cap->device_caps |= V4L2_CAP_SDR_OUTPUT | V4L2_CAP_MODULATOR;

    cap->capabilities = V4L2_CAP_SDR_CAPTURE | V4L2_CAP_TUNER |
    V4L2_CAP_SDR_OUTPUT | V4L2_CAP_MODULATOR |
    - V4L2_CAP_STREAMING | V4L2_CAP_READWRITE |
    - V4L2_CAP_DEVICE_CAPS;
    + V4L2_CAP_DEVICE_CAPS | cap->device_caps;
    strlcpy(cap->driver, KBUILD_MODNAME, sizeof(cap->driver));
    strlcpy(cap->card, dev->rx_vdev.name, sizeof(cap->card));
    usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
    --
    2.14.3
    \
     
     \ /
      Last update: 2018-03-09 18:53    [W:4.928 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site