From 94e03d328f5083c4ede3365aa5f7bde9fb0da8b1 Mon Sep 17 00:00:00 2001
From: Alexey Klimov <klimov.linux@gmail.com>
Date: Sat, 27 Dec 2008 22:33:54 -0300
Subject: [PATCH] --- yaml --- r: 124532 b: refs/heads/master c:
 fc55bcb0a04a66465ab13c33f36a290f6e3a3f7d h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/radio/dsbr100.c | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index cbaef02a8b26..3bacda09f09d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e1ca8491d046d1f01de105add7f2f8f477869ec
+refs/heads/master: fc55bcb0a04a66465ab13c33f36a290f6e3a3f7d
diff --git a/trunk/drivers/media/radio/dsbr100.c b/trunk/drivers/media/radio/dsbr100.c
index 5de5def9c166..448e5a42b468 100644
--- a/trunk/drivers/media/radio/dsbr100.c
+++ b/trunk/drivers/media/radio/dsbr100.c
@@ -1,5 +1,5 @@
-/* A driver for the D-Link DSB-R100 USB radio.  The R100 plugs
- into both the USB and an analog audio input, so this thing
+/* 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.
 
@@ -172,7 +172,6 @@ struct dsbr100_device {
 	int muted;
 };
 
-
 static struct usb_device_id usb_dsbr100_device_table [] = {
 	{ USB_DEVICE(DSB100_VENDOR, DSB100_PRODUCT) },
 	{ }						/* Terminating entry */
@@ -237,7 +236,6 @@ static int dsbr100_start(struct dsbr100_device *radio)
 
 }
 
-
 /* switch off radio */
 static int dsbr100_stop(struct dsbr100_device *radio)
 {
@@ -363,13 +361,14 @@ static void dsbr100_getstat(struct dsbr100_device *radio)
 	mutex_unlock(&radio->lock);
 }
 
-
 /* USB subsystem interface begins here */
 
-/* handle unplugging of the device, release data structures
-if nothing keeps us from doing it.  If something is still
-keeping us busy, the release callback of v4l will take care
-of releasing it. */
+/*
+ * Handle unplugging of the device.
+ * We call video_unregister_device in any case.
+ * The last function called in this procedure is
+ * usb_dsbr100_video_device_release
+ */
 static void usb_dsbr100_disconnect(struct usb_interface *intf)
 {
 	struct dsbr100_device *radio = usb_get_intfdata(intf);
@@ -640,6 +639,7 @@ static int usb_dsbr100_resume(struct usb_interface *intf)
 	return 0;
 }
 
+/* free data structures */
 static void usb_dsbr100_video_device_release(struct video_device *videodev)
 {
 	struct dsbr100_device *radio = videodev_to_radio(videodev);
@@ -683,8 +683,7 @@ static struct video_device dsbr100_videodev_data = {
 	.release	= usb_dsbr100_video_device_release,
 };
 
-/* check if the device is present and register with v4l and
-usb if it is */
+/* check if the device is present and register with v4l and usb if it is */
 static int usb_dsbr100_probe(struct usb_interface *intf,
 				const struct usb_device_id *id)
 {