[media] dsbr100: clean up and update to the latest v4l2 framework (5d778648) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/media/radio/dsbr100.c

+165 −362

Original line number	Diff line number	Diff line
		/* 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
		audio data has to be handled by a sound driver.

		Major issue: I can't find out where the device reports the signal
		strength, and indeed the windows software appearantly just looks
		at the stereo indicator as well. So, scanning will only find
		stereo stations. Sad, but I can't help it.

		Also, the windows program sends oodles of messages over to the
		device, and I couldn't figure out their meaning. My suspicion
		is that they don't have any:-)

		You might find some interesting stuff about this module at
		http://unimut.fsk.uni-heidelberg.de/unimut/demi/dsbr

		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.

		You should have received a copy of the GNU General Public License
		along with this program; if not, write to the Free Software
		Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

		History:

		Version 0.46:
		Removed usb_dsbr100_open/close calls and radio->users counter. Also,
		radio->muted changed to radio->status and suspend/resume calls updated.

		Version 0.45:
		Converted to v4l2_device.

		Version 0.44:
		Add suspend/resume functions, fix unplug of device,
		a lot of cleanups and fixes by Alexey Klimov <klimov.linux@gmail.com>

		Version 0.43:
		Oliver Neukum: avoided DMA coherency issue

		Version 0.42:
		Converted dsbr100 to use video_ioctl2
		by Douglas Landgraf <dougsland@gmail.com>

		Version 0.41-ac1:
		Alan Cox: Some cleanups and fixes

		Version 0.41:
		Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>

		Version 0.40:
		Markus: Updates for 2.6.x kernels, code layout changes, name sanitizing

		Version 0.30:
		Markus: Updates for 2.5.x kernel and more ISO compliant source

		Version 0.25:
		PSL and Markus: Cleanup, radio now doesn't stop on device close

		Version 0.24:
		Markus: Hope I got these silly VIDEO_TUNER_LOW issues finally
		right. Some minor cleanup, improved standalone compilation

		Version 0.23:
		Markus: Sign extension bug fixed by declaring transfer_buffer unsigned

		Version 0.22:
		Markus: Some (brown bag) cleanup in what VIDIOCSTUNER returns,
		thanks to Mike Cox for pointing the problem out.

		Version 0.21:
		Markus: Minor cleanup, warnings if something goes wrong, lame attempt
		to adhere to Documentation/CodingStyle

		Version 0.2:
		Brad Hards <bradh@dynamite.com.au>: Fixes to make it work as non-module
		Markus: Copyright clarification

		Version 0.01: Markus: initial release

		* The device plugs into both the USB and an analog audio input, so this thing
		* only deals with initialisation and frequency setting, the
		* audio data has to be handled by a sound driver.
		*
		* Major issue: I can't find out where the device reports the signal
		* strength, and indeed the windows software appearantly just looks
		* at the stereo indicator as well. So, scanning will only find
		* stereo stations. Sad, but I can't help it.
		*
		* Also, the windows program sends oodles of messages over to the
		* device, and I couldn't figure out their meaning. My suspicion
		* is that they don't have any:-)
		*
		* You might find some interesting stuff about this module at
		* http://unimut.fsk.uni-heidelberg.de/unimut/demi/dsbr
		*
		* 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.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
		*/

		#include <linux/kernel.h>
		@@ -95,17 +40,19 @@
		#include <linux/slab.h>
		#include <linux/input.h>
		#include <linux/videodev2.h>
		#include <linux/usb.h>
		#include <media/v4l2-device.h>
		#include <media/v4l2-ioctl.h>
		#include <linux/usb.h>
		#include <media/v4l2-ctrls.h>
		#include <media/v4l2-event.h>

		/*
		* Version Information
		*/
		#define DRIVER_VERSION "0.4.7"

		#define DRIVER_AUTHOR "Markus Demleitner <msdemlei@tucana.harvard.edu>"
		#define DRIVER_DESC "D-Link DSB-R100 USB FM radio driver"
		MODULE_AUTHOR("Markus Demleitner <msdemlei@tucana.harvard.edu>");
		MODULE_DESCRIPTION("D-Link DSB-R100 USB FM radio driver");
		MODULE_LICENSE("GPL");
		MODULE_VERSION("1.1.0");

		#define DSB100_VENDOR 0x04b4
		#define DSB100_PRODUCT 0x1002
		@@ -122,19 +69,8 @@ devices, that would be 76 and 91. */
		#define FREQ_MAX 108.0
		#define FREQ_MUL 16000

		/* defines for radio->status */
		#define STARTED 0
		#define STOPPED 1

		#define v4l2_dev_to_radio(d) container_of(d, struct dsbr100_device, v4l2_dev)

		static int usb_dsbr100_probe(struct usb_interface *intf,
		const struct usb_device_id *id);
		static void usb_dsbr100_disconnect(struct usb_interface *intf);
		static int usb_dsbr100_suspend(struct usb_interface *intf,
		pm_message_t message);
		static int usb_dsbr100_resume(struct usb_interface *intf);

		static int radio_nr = -1;
		module_param(radio_nr, int, 0);

		@@ -143,179 +79,92 @@ struct dsbr100_device {
		struct usb_device *usbdev;
		struct video_device videodev;
		struct v4l2_device v4l2_dev;
		struct v4l2_ctrl_handler hdl;

		u8 *transfer_buffer;
		struct mutex v4l2_lock;
		int curfreq;
		int stereo;
		int status;
		};

		static struct usb_device_id usb_dsbr100_device_table [] = {
		{ USB_DEVICE(DSB100_VENDOR, DSB100_PRODUCT) },
		{ } /* Terminating entry */
		};

		MODULE_DEVICE_TABLE (usb, usb_dsbr100_device_table);

		/* USB subsystem interface */
		static struct usb_driver usb_dsbr100_driver = {
		.name = "dsbr100",
		.probe = usb_dsbr100_probe,
		.disconnect = usb_dsbr100_disconnect,
		.id_table = usb_dsbr100_device_table,
		.suspend = usb_dsbr100_suspend,
		.resume = usb_dsbr100_resume,
		.reset_resume = usb_dsbr100_resume,
		.supports_autosuspend = 0,
		bool stereo;
		bool muted;
		};

		/* Low-level device interface begins here */

		/* switch on radio */
		static int dsbr100_start(struct dsbr100_device *radio)
		/* set a frequency, freq is defined by v4l's TUNER_LOW, i.e. 1/16th kHz */
		static int dsbr100_setfreq(struct dsbr100_device *radio, unsigned freq)
		{
		int retval;
		int request;
		unsigned f = (freq / 16 * 80) / 1000 + 856;
		int retval = 0;

		if (!radio->muted) {
		retval = usb_control_msg(radio->usbdev,
		usb_rcvctrlpipe(radio->usbdev, 0),
		USB_REQ_GET_STATUS,
		DSB100_TUNE,
		USB_TYPE_VENDOR \| USB_RECIP_DEVICE \| USB_DIR_IN,
		0x00, 0xC7, radio->transfer_buffer, 8, 300);

		if (retval < 0) {
		request = USB_REQ_GET_STATUS;
		goto usb_control_msg_failed;
		(f >> 8) & 0x00ff, f & 0xff,
		radio->transfer_buffer, 8, 300);
		if (retval >= 0)
		mdelay(1);
		}

		retval = usb_control_msg(radio->usbdev,
		usb_rcvctrlpipe(radio->usbdev, 0),
		DSB100_ONOFF,
		USB_TYPE_VENDOR \| USB_RECIP_DEVICE \| USB_DIR_IN,
		0x01, 0x00, radio->transfer_buffer, 8, 300);

		if (retval < 0) {
		request = DSB100_ONOFF;
		goto usb_control_msg_failed;
		if (retval >= 0) {
		radio->curfreq = freq;
		return 0;
		}

		radio->status = STARTED;
		return (radio->transfer_buffer)[0];

		usb_control_msg_failed:
		dev_err(&radio->usbdev->dev,
		"%s - usb_control_msg returned %i, request %i\n",
		__func__, retval, request);
		__func__, retval, DSB100_TUNE);
		return retval;

		}

		/* switch off radio */
		static int dsbr100_stop(struct dsbr100_device *radio)
		/* switch on radio */
		static int dsbr100_start(struct dsbr100_device *radio)
		{
		int retval;
		int request;

		retval = usb_control_msg(radio->usbdev,
		usb_rcvctrlpipe(radio->usbdev, 0),
		USB_REQ_GET_STATUS,
		USB_TYPE_VENDOR \| USB_RECIP_DEVICE \| USB_DIR_IN,
		0x16, 0x1C, radio->transfer_buffer, 8, 300);

		if (retval < 0) {
		request = USB_REQ_GET_STATUS;
		goto usb_control_msg_failed;
		}

		retval = usb_control_msg(radio->usbdev,
		int retval = usb_control_msg(radio->usbdev,
		usb_rcvctrlpipe(radio->usbdev, 0),
		DSB100_ONOFF,
		USB_TYPE_VENDOR \| USB_RECIP_DEVICE \| USB_DIR_IN,
		0x00, 0x00, radio->transfer_buffer, 8, 300);

		if (retval < 0) {
		request = DSB100_ONOFF;
		goto usb_control_msg_failed;
		}

		radio->status = STOPPED;
		return (radio->transfer_buffer)[0];
		0x01, 0x00, radio->transfer_buffer, 8, 300);

		usb_control_msg_failed:
		if (retval >= 0)
		return dsbr100_setfreq(radio, radio->curfreq);
		dev_err(&radio->usbdev->dev,
		"%s - usb_control_msg returned %i, request %i\n",
		__func__, retval, request);
		__func__, retval, DSB100_ONOFF);
		return retval;

		}

		/* set a frequency, freq is defined by v4l's TUNER_LOW, i.e. 1/16th kHz */
		static int dsbr100_setfreq(struct dsbr100_device *radio)
		/* switch off radio */
		static int dsbr100_stop(struct dsbr100_device *radio)
		{
		int retval;
		int request;
		int freq = (radio->curfreq / 16 * 80) / 1000 + 856;

		retval = usb_control_msg(radio->usbdev,
		usb_rcvctrlpipe(radio->usbdev, 0),
		DSB100_TUNE,
		USB_TYPE_VENDOR \| USB_RECIP_DEVICE \| USB_DIR_IN,
		(freq >> 8) & 0x00ff, freq & 0xff,
		radio->transfer_buffer, 8, 300);

		if (retval < 0) {
		request = DSB100_TUNE;
		goto usb_control_msg_failed;
		}

		retval = usb_control_msg(radio->usbdev,
		usb_rcvctrlpipe(radio->usbdev, 0),
		USB_REQ_GET_STATUS,
		USB_TYPE_VENDOR \| USB_RECIP_DEVICE \| USB_DIR_IN,
		0x96, 0xB7, radio->transfer_buffer, 8, 300);

		if (retval < 0) {
		request = USB_REQ_GET_STATUS;
		goto usb_control_msg_failed;
		}

		retval = usb_control_msg(radio->usbdev,
		int retval = usb_control_msg(radio->usbdev,
		usb_rcvctrlpipe(radio->usbdev, 0),
		USB_REQ_GET_STATUS,
		DSB100_ONOFF,
		USB_TYPE_VENDOR \| USB_RECIP_DEVICE \| USB_DIR_IN,
		0x00, 0x24, radio->transfer_buffer, 8, 300);

		if (retval < 0) {
		request = USB_REQ_GET_STATUS;
		goto usb_control_msg_failed;
		}

		radio->stereo = !((radio->transfer_buffer)[0] & 0x01);
		return (radio->transfer_buffer)[0];
		0x00, 0x00, radio->transfer_buffer, 8, 300);

		usb_control_msg_failed:
		radio->stereo = -1;
		if (retval >= 0)
		return 0;
		dev_err(&radio->usbdev->dev,
		"%s - usb_control_msg returned %i, request %i\n",
		__func__, retval, request);
		__func__, retval, DSB100_ONOFF);
		return retval;

		}

		/* return the device status. This is, in effect, just whether it
		sees a stereo signal or not. Pity. */
		static void dsbr100_getstat(struct dsbr100_device *radio)
		{
		int retval;

		retval = usb_control_msg(radio->usbdev,
		int retval = usb_control_msg(radio->usbdev,
		usb_rcvctrlpipe(radio->usbdev, 0),
		USB_REQ_GET_STATUS,
		USB_TYPE_VENDOR \| USB_RECIP_DEVICE \| USB_DIR_IN,
		0x00, 0x24, radio->transfer_buffer, 8, 300);

		if (retval < 0) {
		radio->stereo = -1;
		radio->stereo = false;
		dev_err(&radio->usbdev->dev,
		"%s - usb_control_msg returned %i, request %i\n",
		__func__, retval, USB_REQ_GET_STATUS);
		@@ -332,7 +181,8 @@ static int vidioc_querycap(struct file file, void priv,
		strlcpy(v->driver, "dsbr100", sizeof(v->driver));
		strlcpy(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->capabilities = V4L2_CAP_TUNER;
		v->device_caps = V4L2_CAP_RADIO \| V4L2_CAP_TUNER;
		v->capabilities = v->device_caps \| V4L2_CAP_DEVICE_CAPS;
		return 0;
		}

		@@ -349,13 +199,11 @@ static int vidioc_g_tuner(struct file file, void priv,
		v->type = V4L2_TUNER_RADIO;
		v->rangelow = FREQ_MIN * FREQ_MUL;
		v->rangehigh = FREQ_MAX * FREQ_MUL;
		v->rxsubchans = V4L2_TUNER_SUB_MONO \| V4L2_TUNER_SUB_STEREO;
		v->capability = V4L2_TUNER_CAP_LOW;
		if(radio->stereo)
		v->rxsubchans = radio->stereo ? V4L2_TUNER_SUB_STEREO :
		V4L2_TUNER_SUB_MONO;
		v->capability = V4L2_TUNER_CAP_LOW \| V4L2_TUNER_CAP_STEREO;
		v->audmode = V4L2_TUNER_MODE_STEREO;
		else
		v->audmode = V4L2_TUNER_MODE_MONO;
		v->signal = 0xffff; /* We can't get the signal strength */
		v->signal = radio->stereo ? 0xffff : 0; /* We can't get the signal strength */
		return 0;
		}

		@@ -369,14 +217,12 @@ static int vidioc_s_frequency(struct file file, void priv,
		struct v4l2_frequency *f)
		{
		struct dsbr100_device *radio = video_drvdata(file);
		int retval;

		radio->curfreq = f->frequency;
		if (f->tuner != 0 \|\| f->type != V4L2_TUNER_RADIO)
		return -EINVAL;

		retval = dsbr100_setfreq(radio);
		if (retval < 0)
		dev_warn(&radio->usbdev->dev, "Set frequency failed\n");
		return 0;
		return dsbr100_setfreq(radio, clamp_t(unsigned, f->frequency,
		FREQ_MIN * FREQ_MUL, FREQ_MAX * FREQ_MUL));
		}

		static int vidioc_g_frequency(struct file file, void priv,
		@@ -384,90 +230,26 @@ static int vidioc_g_frequency(struct file file, void priv,
		{
		struct dsbr100_device *radio = video_drvdata(file);

		if (f->tuner)
		return -EINVAL;
		f->type = V4L2_TUNER_RADIO;
		f->frequency = radio->curfreq;
		return 0;
		}

		static int vidioc_queryctrl(struct file file, void priv,
		struct v4l2_queryctrl *qc)
		static int usb_dsbr100_s_ctrl(struct v4l2_ctrl *ctrl)
		{
		switch (qc->id) {
		case V4L2_CID_AUDIO_MUTE:
		return v4l2_ctrl_query_fill(qc, 0, 1, 1, 1);
		}

		return -EINVAL;
		}

		static int vidioc_g_ctrl(struct file file, void priv,
		struct v4l2_control *ctrl)
		{
		struct dsbr100_device *radio = video_drvdata(file);
		struct dsbr100_device *radio =
		container_of(ctrl->handler, struct dsbr100_device, hdl);

		switch (ctrl->id) {
		case V4L2_CID_AUDIO_MUTE:
		ctrl->value = radio->status;
		return 0;
		radio->muted = ctrl->val;
		return radio->muted ? dsbr100_stop(radio) : dsbr100_start(radio);
		}
		return -EINVAL;
		}

		static int vidioc_s_ctrl(struct file file, void priv,
		struct v4l2_control *ctrl)
		{
		struct dsbr100_device *radio = video_drvdata(file);
		int retval;

		switch (ctrl->id) {
		case V4L2_CID_AUDIO_MUTE:
		if (ctrl->value) {
		retval = dsbr100_stop(radio);
		if (retval < 0) {
		dev_warn(&radio->usbdev->dev,
		"Radio did not respond properly\n");
		return -EBUSY;
		}
		} else {
		retval = dsbr100_start(radio);
		if (retval < 0) {
		dev_warn(&radio->usbdev->dev,
		"Radio did not respond properly\n");
		return -EBUSY;
		}
		}
		return 0;
		}
		return -EINVAL;
		}

		static int vidioc_g_audio(struct file file, void priv,
		struct v4l2_audio *a)
		{
		if (a->index > 1)
		return -EINVAL;

		strcpy(a->name, "Radio");
		a->capability = V4L2_AUDCAP_STEREO;
		return 0;
		}

		static int vidioc_g_input(struct file filp, void priv, unsigned int *i)
		{
		*i = 0;
		return 0;
		}

		static int vidioc_s_input(struct file filp, void priv, unsigned int i)
		{
		return i ? -EINVAL : 0;
		}

		static int vidioc_s_audio(struct file file, void priv,
		struct v4l2_audio *a)
		{
		return a->index ? -EINVAL : 0;
		}

		/* USB subsystem interface begins here */

		@@ -482,6 +264,16 @@ static void usb_dsbr100_disconnect(struct usb_interface *intf)
		struct dsbr100_device *radio = usb_get_intfdata(intf);

		mutex_lock(&radio->v4l2_lock);
		/*
		* Disconnect is also called on unload, and in that case we need to
		* mute the device. This call will silently fail if it is called
		* after a physical disconnect.
		*/
		usb_control_msg(radio->usbdev,
		usb_rcvctrlpipe(radio->usbdev, 0),
		DSB100_ONOFF,
		USB_TYPE_VENDOR \| USB_RECIP_DEVICE \| USB_DIR_IN,
		0x00, 0x00, radio->transfer_buffer, 8, 300);
		usb_set_intfdata(intf, NULL);
		video_unregister_device(&radio->videodev);
		v4l2_device_disconnect(&radio->v4l2_dev);
		@@ -494,25 +286,13 @@ static void usb_dsbr100_disconnect(struct usb_interface *intf)
		static int usb_dsbr100_suspend(struct usb_interface *intf, pm_message_t message)
		{
		struct dsbr100_device *radio = usb_get_intfdata(intf);
		int retval;

		mutex_lock(&radio->v4l2_lock);
		if (radio->status == STARTED) {
		retval = dsbr100_stop(radio);
		if (retval < 0)
		if (!radio->muted && dsbr100_stop(radio) < 0)
		dev_warn(&intf->dev, "dsbr100_stop failed\n");

		/* After dsbr100_stop() status set to STOPPED.
		* If we want driver to start radio on resume
		* we set status equal to STARTED.
		* On resume we will check status and run radio if needed.
		*/
		radio->status = STARTED;
		}
		mutex_unlock(&radio->v4l2_lock);

		dev_info(&intf->dev, "going into suspend..\n");

		return 0;
		}

		@@ -520,18 +300,13 @@ static int usb_dsbr100_suspend(struct usb_interface *intf, pm_message_t message)
		static int usb_dsbr100_resume(struct usb_interface *intf)
		{
		struct dsbr100_device *radio = usb_get_intfdata(intf);
		int retval;

		mutex_lock(&radio->v4l2_lock);
		if (radio->status == STARTED) {
		retval = dsbr100_start(radio);
		if (retval < 0)
		if (!radio->muted && dsbr100_start(radio) < 0)
		dev_warn(&intf->dev, "dsbr100_start failed\n");
		}
		mutex_unlock(&radio->v4l2_lock);

		dev_info(&intf->dev, "coming out of suspend..\n");

		return 0;
		}

		@@ -540,15 +315,23 @@ static void usb_dsbr100_release(struct v4l2_device *v4l2_dev)
		{
		struct dsbr100_device *radio = v4l2_dev_to_radio(v4l2_dev);

		v4l2_ctrl_handler_free(&radio->hdl);
		v4l2_device_unregister(&radio->v4l2_dev);
		kfree(radio->transfer_buffer);
		kfree(radio);
		}

		static const struct v4l2_ctrl_ops usb_dsbr100_ctrl_ops = {
		.s_ctrl = usb_dsbr100_s_ctrl,
		};

		/* File system interface */
		static const struct v4l2_file_operations usb_dsbr100_fops = {
		.owner = THIS_MODULE,
		.unlocked_ioctl = video_ioctl2,
		.open = v4l2_fh_open,
		.release = v4l2_fh_release,
		.poll = v4l2_ctrl_poll,
		};

		static const struct v4l2_ioctl_ops usb_dsbr100_ioctl_ops = {
		@@ -557,13 +340,9 @@ static const struct v4l2_ioctl_ops usb_dsbr100_ioctl_ops = {
		.vidioc_s_tuner = vidioc_s_tuner,
		.vidioc_g_frequency = vidioc_g_frequency,
		.vidioc_s_frequency = vidioc_s_frequency,
		.vidioc_queryctrl = vidioc_queryctrl,
		.vidioc_g_ctrl = vidioc_g_ctrl,
		.vidioc_s_ctrl = vidioc_s_ctrl,
		.vidioc_g_audio = vidioc_g_audio,
		.vidioc_s_audio = vidioc_s_audio,
		.vidioc_g_input = vidioc_g_input,
		.vidioc_s_input = vidioc_s_input,
		.vidioc_log_status = v4l2_ctrl_log_status,
		.vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
		.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
		};

		/* check if the device is present and register with v4l and usb if it is */
		@@ -592,11 +371,17 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
		retval = v4l2_device_register(&intf->dev, v4l2_dev);
		if (retval < 0) {
		v4l2_err(v4l2_dev, "couldn't register v4l2_device\n");
		kfree(radio->transfer_buffer);
		kfree(radio);
		return retval;
		goto err_reg_dev;
		}

		v4l2_ctrl_handler_init(&radio->hdl, 1);
		v4l2_ctrl_new_std(&radio->hdl, &usb_dsbr100_ctrl_ops,
		V4L2_CID_AUDIO_MUTE, 0, 1, 1, 1);
		if (radio->hdl.error) {
		retval = radio->hdl.error;
		v4l2_err(v4l2_dev, "couldn't register control\n");
		goto err_reg_ctrl;
		}
		mutex_init(&radio->v4l2_lock);
		strlcpy(radio->videodev.name, v4l2_dev->name, sizeof(radio->videodev.name));
		radio->videodev.v4l2_dev = v4l2_dev;
		@@ -604,28 +389,46 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
		radio->videodev.ioctl_ops = &usb_dsbr100_ioctl_ops;
		radio->videodev.release = video_device_release_empty;
		radio->videodev.lock = &radio->v4l2_lock;
		radio->videodev.ctrl_handler = &radio->hdl;
		set_bit(V4L2_FL_USE_FH_PRIO, &radio->videodev.flags);

		radio->usbdev = interface_to_usbdev(intf);
		radio->curfreq = FREQ_MIN * FREQ_MUL;
		radio->status = STOPPED;
		radio->muted = true;

		video_set_drvdata(&radio->videodev, radio);
		usb_set_intfdata(intf, radio);

		retval = video_register_device(&radio->videodev, VFL_TYPE_RADIO, radio_nr);
		if (retval < 0) {
		if (retval == 0)
		return 0;
		v4l2_err(v4l2_dev, "couldn't register video device\n");

		err_reg_ctrl:
		v4l2_ctrl_handler_free(&radio->hdl);
		v4l2_device_unregister(v4l2_dev);
		err_reg_dev:
		kfree(radio->transfer_buffer);
		kfree(radio);
		return -EIO;
		}
		usb_set_intfdata(intf, radio);
		return 0;
		return retval;
		}

		module_usb_driver(usb_dsbr100_driver);
		static struct usb_device_id usb_dsbr100_device_table[] = {
		{ USB_DEVICE(DSB100_VENDOR, DSB100_PRODUCT) },
		{ } /* Terminating entry */
		};

		MODULE_AUTHOR( DRIVER_AUTHOR );
		MODULE_DESCRIPTION( DRIVER_DESC );
		MODULE_LICENSE("GPL");
		MODULE_VERSION(DRIVER_VERSION);
		MODULE_DEVICE_TABLE(usb, usb_dsbr100_device_table);

		/* USB subsystem interface */
		static struct usb_driver usb_dsbr100_driver = {
		.name = "dsbr100",
		.probe = usb_dsbr100_probe,
		.disconnect = usb_dsbr100_disconnect,
		.id_table = usb_dsbr100_device_table,
		.suspend = usb_dsbr100_suspend,
		.resume = usb_dsbr100_resume,
		.reset_resume = usb_dsbr100_resume,
		};

		module_usb_driver(usb_dsbr100_driver);