Merge tag 'v5.2-rc4' into media/master

[sfrench/cifs-2.6.git] / drivers / media / radio / dsbr100.c

diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index c9d51a5f28389b21b6a7d3d8503d000612ce9cf6..9a45cda0577993206c7e287ce03467713f16ee41 100644 (file)
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* A driver for the D-Link DSB-R100 USB radio and Gemtek USB Radio 21.
  * The device plugs into both the USB and an analog audio input, so this thing
  * only deals with initialisation and frequency setting, the
@@ -18,16 +19,6 @@
  * Fully tested with the Keene USB FM Transmitter and the v4l2-compliance tool.
  *
  * Copyright (c) 2000 Markus Demleitner <msdemlei@cl.uni-heidelberg.de>
- *
- * 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.
 */
 
 #include <linux/kernel.h>
@@ -177,8 +168,6 @@ static int vidioc_querycap(struct file *file, void *priv,
        strscpy(v->driver, "dsbr100", sizeof(v->driver));
        strscpy(v->card, "D-Link R-100 USB FM Radio", sizeof(v->card));
        usb_make_path(radio->usbdev, v->bus_info, sizeof(v->bus_info));
-       v->device_caps = V4L2_CAP_RADIO | V4L2_CAP_TUNER;
-       v->capabilities = v->device_caps | V4L2_CAP_DEVICE_CAPS;
        return 0;
 }
 
@@ -387,6 +376,7 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
        radio->videodev.release = video_device_release_empty;
        radio->videodev.lock = &radio->v4l2_lock;
        radio->videodev.ctrl_handler = &radio->hdl;
+       radio->videodev.device_caps = V4L2_CAP_RADIO | V4L2_CAP_TUNER;
 
        radio->usbdev = interface_to_usbdev(intf);
        radio->curfreq = FREQ_MIN * FREQ_MUL;