7 files changed, 386 insertions, 128 deletions

diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index a5ca176a7b08..5474a22c1b22 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/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.
 
@@ -33,6 +33,10 @@
 
  History:
 
+ 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
 
@@ -93,8 +97,8 @@
  */
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
 
-#define DRIVER_VERSION "v0.41"
-#define RADIO_VERSION KERNEL_VERSION(0,4,1)
+#define DRIVER_VERSION "v0.44"
+#define RADIO_VERSION KERNEL_VERSION(0, 4, 4)
 
 static struct v4l2_queryctrl radio_qctrl[] = {
         {
@@ -104,7 +108,27 @@ static struct v4l2_queryctrl radio_qctrl[] = {
                 .maximum       = 1,
                 .default_value = 1,
                 .type          = V4L2_CTRL_TYPE_BOOLEAN,
-        }
+        },
+/* HINT: the disabled controls are only here to satify kradio and such apps */
+        {       .id             = V4L2_CID_AUDIO_VOLUME,
+                .flags          = V4L2_CTRL_FLAG_DISABLED,
+        },
+        {
+                .id             = V4L2_CID_AUDIO_BALANCE,
+                .flags          = V4L2_CTRL_FLAG_DISABLED,
+        },
+        {
+                .id             = V4L2_CID_AUDIO_BASS,
+                .flags          = V4L2_CTRL_FLAG_DISABLED,
+        },
+        {
+                .id             = V4L2_CID_AUDIO_TREBLE,
+                .flags          = V4L2_CTRL_FLAG_DISABLED,
+        },
+        {
+                .id             = V4L2_CID_AUDIO_LOUDNESS,
+                .flags          = V4L2_CTRL_FLAG_DISABLED,
+        },
 };
 
 #define DRIVER_AUTHOR "Markus Demleitner <msdemlei@tucana.harvard.edu>"
@@ -125,12 +149,16 @@ devices, that would be 76 and 91.  */
 #define FREQ_MAX 108.0
 #define FREQ_MUL 16000
 
+#define videodev_to_radio(d) container_of(d, struct dsbr100_device, videodev)
 
 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_open(struct inode *inode, struct file *file);
 static int usb_dsbr100_close(struct inode *inode, struct file *file);
+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);
@@ -138,8 +166,9 @@ module_param(radio_nr, int, 0);
 /* Data for one (physical) device */
 struct dsbr100_device {
         struct usb_device *usbdev;
-        struct video_device *videodev;
+        struct video_device videodev;
         u8 *transfer_buffer;
+        struct mutex lock;      /* buffer locking */
         int curfreq;
         int stereo;
         int users;
@@ -147,7 +176,6 @@ struct dsbr100_device {
         int muted;
 };
 
-
 static struct usb_device_id usb_dsbr100_device_table [] = {
         { USB_DEVICE(DSB100_VENDOR, DSB100_PRODUCT) },
         { }                                             /* Terminating entry */
@@ -157,10 +185,14 @@ 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,
+        .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,
 };
 
 /* Low-level device interface begins here */
@@ -168,95 +200,190 @@ static struct usb_driver usb_dsbr100_driver = {
 /* switch on radio */
 static int dsbr100_start(struct dsbr100_device *radio)
 {
-        if (usb_control_msg(radio->usbdev, usb_rcvctrlpipe(radio->usbdev, 0),
-                        USB_REQ_GET_STATUS,
-                        USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
-                        0x00, 0xC7, radio->transfer_buffer, 8, 300) < 0 ||
-        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) < 0)
-                return -1;
-        radio->muted=0;
+        int retval;
+        int request;
+
+        mutex_lock(&radio->lock);
+
+        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, 0xC7, radio->transfer_buffer, 8, 300);
+
+        if (retval < 0) {
+                request = USB_REQ_GET_STATUS;
+                goto usb_control_msg_failed;
+        }
+
+        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;
+        }
+
+        radio->muted = 0;
+        mutex_unlock(&radio->lock);
         return (radio->transfer_buffer)[0];
-}
 
+usb_control_msg_failed:
+        mutex_unlock(&radio->lock);
+        dev_err(&radio->usbdev->dev,
+                "%s - usb_control_msg returned %i, request %i\n",
+                        __func__, retval, request);
+        return retval;
+
+}
 
 /* switch off radio */
 static int dsbr100_stop(struct dsbr100_device *radio)
 {
-        if (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) < 0 ||
-        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) < 0)
-                return -1;
-        radio->muted=1;
+        int retval;
+        int request;
+
+        mutex_lock(&radio->lock);
+
+        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,
+                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->muted = 1;
+        mutex_unlock(&radio->lock);
         return (radio->transfer_buffer)[0];
+
+usb_control_msg_failed:
+        mutex_unlock(&radio->lock);
+        dev_err(&radio->usbdev->dev,
+                "%s - usb_control_msg returned %i, request %i\n",
+                        __func__, retval, request);
+        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, int freq)
 {
+        int retval;
+        int request;
+
         freq = (freq / 16 * 80) / 1000 + 856;
-        if (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) < 0 ||
-           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) < 0 ||
-        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) < 0) {
-                radio->stereo = -1;
-                return -1;
+        mutex_lock(&radio->lock);
+
+        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,
+                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) {
+                request = USB_REQ_GET_STATUS;
+                goto usb_control_msg_failed;
+        }
+
         radio->stereo = !((radio->transfer_buffer)[0] & 0x01);
+        mutex_unlock(&radio->lock);
         return (radio->transfer_buffer)[0];
+
+usb_control_msg_failed:
+        radio->stereo = -1;
+        mutex_unlock(&radio->lock);
+        dev_err(&radio->usbdev->dev,
+                "%s - usb_control_msg returned %i, request %i\n",
+                        __func__, retval, request);
+        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)
 {
-        if (usb_control_msg(radio->usbdev, usb_rcvctrlpipe(radio->usbdev, 0),
+        int retval;
+
+        mutex_lock(&radio->lock);
+
+        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) < 0)
+                0x00 , 0x24, radio->transfer_buffer, 8, 300);
+
+        if (retval < 0) {
                 radio->stereo = -1;
-        else
+                dev_err(&radio->usbdev->dev,
+                        "%s - usb_control_msg returned %i, request %i\n",
+                                __func__, retval, USB_REQ_GET_STATUS);
+        } else {
                 radio->stereo = !(radio->transfer_buffer[0] & 0x01);
-}
+        }
 
+        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);
 
         usb_set_intfdata (intf, NULL);
-        if (radio) {
-                video_unregister_device(radio->videodev);
-                radio->videodev = NULL;
-                if (radio->users) {
-                        kfree(radio->transfer_buffer);
-                        kfree(radio);
-                } else {
-                        radio->removed = 1;
-                }
-        }
+
+        mutex_lock(&radio->lock);
+        radio->removed = 1;
+        mutex_unlock(&radio->lock);
+
+        video_unregister_device(&radio->videodev);
 }
 
 
@@ -276,6 +403,10 @@ static int vidioc_g_tuner(struct file *file, void *priv,
 {
         struct dsbr100_device *radio = video_drvdata(file);
 
+        /* safety check */
+        if (radio->removed)
+                return -EIO;
+
         if (v->index > 0)
                 return -EINVAL;
 
@@ -297,6 +428,12 @@ static int vidioc_g_tuner(struct file *file, void *priv,
 static int vidioc_s_tuner(struct file *file, void *priv,
                                 struct v4l2_tuner *v)
 {
+        struct dsbr100_device *radio = video_drvdata(file);
+
+        /* safety check */
+        if (radio->removed)
+                return -EIO;
+
         if (v->index > 0)
                 return -EINVAL;
 
@@ -307,9 +444,15 @@ static int vidioc_s_frequency(struct file *file, void *priv,
                                 struct v4l2_frequency *f)
 {
         struct dsbr100_device *radio = video_drvdata(file);
+        int retval;
+
+        /* safety check */
+        if (radio->removed)
+                return -EIO;
 
         radio->curfreq = f->frequency;
-        if (dsbr100_setfreq(radio, radio->curfreq) == -1)
+        retval = dsbr100_setfreq(radio, radio->curfreq);
+        if (retval < 0)
                 dev_warn(&radio->usbdev->dev, "Set frequency failed\n");
         return 0;
 }
@@ -319,6 +462,10 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct dsbr100_device *radio = video_drvdata(file);
 
+        /* safety check */
+        if (radio->removed)
+                return -EIO;
+
         f->type = V4L2_TUNER_RADIO;
         f->frequency = radio->curfreq;
         return 0;
@@ -343,6 +490,10 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 {
         struct dsbr100_device *radio = video_drvdata(file);
 
+        /* safety check */
+        if (radio->removed)
+                return -EIO;
+
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
                 ctrl->value = radio->muted;
@@ -355,17 +506,24 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
         struct dsbr100_device *radio = video_drvdata(file);
+        int retval;
+
+        /* safety check */
+        if (radio->removed)
+                return -EIO;
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
                 if (ctrl->value) {
-                        if (dsbr100_stop(radio) == -1) {
+                        retval = dsbr100_stop(radio);
+                        if (retval < 0) {
                                 dev_warn(&radio->usbdev->dev,
                                          "Radio did not respond properly\n");
                                 return -EBUSY;
                         }
                 } else {
-                        if (dsbr100_start(radio) == -1) {
+                        retval = dsbr100_start(radio);
+                        if (retval < 0) {
                                 dev_warn(&radio->usbdev->dev,
                                          "Radio did not respond properly\n");
                                 return -EBUSY;
@@ -417,7 +575,8 @@ static int usb_dsbr100_open(struct inode *inode, struct file *file)
         radio->users = 1;
         radio->muted = 1;
 
-        if (dsbr100_start(radio) < 0) {
+        retval = dsbr100_start(radio);
+        if (retval < 0) {
                 dev_warn(&radio->usbdev->dev,
                          "Radio did not start up properly\n");
                 radio->users = 0;
@@ -426,9 +585,9 @@ static int usb_dsbr100_open(struct inode *inode, struct file *file)
         }
 
         retval = dsbr100_setfreq(radio, radio->curfreq);
-
-        if (retval == -1)
-                printk(KERN_WARNING KBUILD_MODNAME ": Set frequency failed\n");
+        if (retval < 0)
+                dev_warn(&radio->usbdev->dev,
+                        "set frequency failed\n");
 
         unlock_kernel();
         return 0;
@@ -437,17 +596,62 @@ static int usb_dsbr100_open(struct inode *inode, struct file *file)
 static int usb_dsbr100_close(struct inode *inode, struct file *file)
 {
         struct dsbr100_device *radio = video_drvdata(file);
+        int retval;
 
         if (!radio)
                 return -ENODEV;
+
         radio->users = 0;
-        if (radio->removed) {
-                kfree(radio->transfer_buffer);
-                kfree(radio);
+        if (!radio->removed) {
+                retval = dsbr100_stop(radio);
+                if (retval < 0) {
+                        dev_warn(&radio->usbdev->dev,
+                                "dsbr100_stop failed\n");
+                }
+
         }
         return 0;
 }
 
+/* Suspend device - stop device. */
+static int usb_dsbr100_suspend(struct usb_interface *intf, pm_message_t message)
+{
+        struct dsbr100_device *radio = usb_get_intfdata(intf);
+        int retval;
+
+        retval = dsbr100_stop(radio);
+        if (retval < 0)
+                dev_warn(&intf->dev, "dsbr100_stop failed\n");
+
+        dev_info(&intf->dev, "going into suspend..\n");
+
+        return 0;
+}
+
+/* Resume device - start device. */
+static int usb_dsbr100_resume(struct usb_interface *intf)
+{
+        struct dsbr100_device *radio = usb_get_intfdata(intf);
+        int retval;
+
+        retval = dsbr100_start(radio);
+        if (retval < 0)
+                dev_warn(&intf->dev, "dsbr100_start failed\n");
+
+        dev_info(&intf->dev, "coming out of suspend..\n");
+
+        return 0;
+}
+
+/* free data structures */
+static void usb_dsbr100_video_device_release(struct video_device *videodev)
+{
+        struct dsbr100_device *radio = videodev_to_radio(videodev);
+
+        kfree(radio->transfer_buffer);
+        kfree(radio);
+}
+
 /* File system interface */
 static const struct file_operations usb_dsbr100_fops = {
         .owner          = THIS_MODULE,
@@ -476,19 +680,19 @@ static const struct v4l2_ioctl_ops usb_dsbr100_ioctl_ops = {
 };
 
 /* V4L2 interface */
-static struct video_device dsbr100_videodev_template = {
+static struct video_device dsbr100_videodev_data = {
         .name           = "D-Link DSB-R 100",
         .fops           = &usb_dsbr100_fops,
         .ioctl_ops      = &usb_dsbr100_ioctl_ops,
-        .release        = video_device_release,
+        .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)
 {
         struct dsbr100_device *radio;
+        int retval;
 
         radio = kmalloc(sizeof(struct dsbr100_device), GFP_KERNEL);
 
@@ -501,23 +705,18 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
                 kfree(radio);
                 return -ENOMEM;
         }
-        radio->videodev = video_device_alloc();
 
-        if (!(radio->videodev)) {
-                kfree(radio->transfer_buffer);
-                kfree(radio);
-                return -ENOMEM;
-        }
-        memcpy(radio->videodev, &dsbr100_videodev_template,
-                sizeof(dsbr100_videodev_template));
+        mutex_init(&radio->lock);
+        radio->videodev = dsbr100_videodev_data;
+
         radio->removed = 0;
         radio->users = 0;
         radio->usbdev = interface_to_usbdev(intf);
         radio->curfreq = FREQ_MIN * FREQ_MUL;
-        video_set_drvdata(radio->videodev, radio);
-        if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr) < 0) {
-                dev_warn(&intf->dev, "Could not register video device\n");
-                video_device_release(radio->videodev);
+        video_set_drvdata(&radio->videodev, radio);
+        retval = video_register_device(&radio->videodev, VFL_TYPE_RADIO, radio_nr);
+        if (retval < 0) {
+                dev_err(&intf->dev, "couldn't register video device\n");
                 kfree(radio->transfer_buffer);
                 kfree(radio);
                 return -EIO;
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index 9305e958fc66..dd6d3dfcd7d2 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -1,7 +1,7 @@
 /* radiotrack (radioreveal) driver for Linux radio support
  * (c) 1997 M. Kirkwood
  * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>
- * Converted to new API by Alan Cox <Alan.Cox@linux.org>
+ * Converted to new API by Alan Cox <alan@lxorguk.ukuu.org.uk>
  * Various bugfixes and enhancements by Russell Kroll <rkroll@exploits.org>
  *
  * History:
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 0490a1fa999d..bfd37f38b9ab 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -23,7 +23,7 @@
  * 2002-01-17   Adam Belay <ambx1@neo.rr.com>
  *              Updated to latest pnp code
  *
- * 2003-01-31   Alan Cox <alan@redhat.com>
+ * 2003-01-31   Alan Cox <alan@lxorguk.ukuu.org.uk>
  *              Cleaned up locking, delay code, general odds and ends
  *
  * 2006-07-30   Hans J. Koch <koch@hjk-az.de>
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index d131a5d38128..e13118da307b 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -8,7 +8,7 @@
  *    RadioTrack II driver for Linux radio support (C) 1998 Ben Pfaff
  *
  *    Based on RadioTrack I/RadioReveal (C) 1997 M. Kirkwood
- *    Converted to new API by Alan Cox <Alan.Cox@linux.org>
+ *    Converted to new API by Alan Cox <alan@lxorguk.ukuu.org.uk>
  *    Various bugfixes and enhancements by Russell Kroll <rkroll@exploits.org>
  *
  * TODO: Allow for more than one of these foolish entities :-)
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index 256cbeffdcb6..e730eddb2bb5 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -72,6 +72,11 @@ MODULE_LICENSE("GPL");
 #define USB_AMRADIO_VENDOR 0x07ca
 #define USB_AMRADIO_PRODUCT 0xb800
 
+/* dev_warn macro with driver name */
+#define MR800_DRIVER_NAME "radio-mr800"
+#define amradio_dev_warn(dev, fmt, arg...)                              \
+                dev_warn(dev, MR800_DRIVER_NAME " - " fmt, ##arg)
+
 /* Probably USB_TIMEOUT should be modified in module parameter */
 #define BUFFER_LENGTH 8
 #define USB_TIMEOUT 500
@@ -154,14 +159,14 @@ MODULE_DEVICE_TABLE(usb, usb_amradio_device_table);
 
 /* USB subsystem interface */
 static struct usb_driver usb_amradio_driver = {
-        .name                   = "radio-mr800",
+        .name                   = MR800_DRIVER_NAME,
         .probe                  = usb_amradio_probe,
         .disconnect             = usb_amradio_disconnect,
         .suspend                = usb_amradio_suspend,
         .resume                 = usb_amradio_resume,
         .reset_resume           = usb_amradio_resume,
         .id_table               = usb_amradio_device_table,
-        .supports_autosuspend   = 1,
+        .supports_autosuspend   = 0,
 };
 
 /* switch on radio. Send 8 bytes to device. */
@@ -202,6 +207,10 @@ static int amradio_stop(struct amradio_device *radio)
         int retval;
         int size;
 
+        /* safety check */
+        if (radio->removed)
+                return -EIO;
+
         mutex_lock(&radio->lock);
 
         radio->buffer[0] = 0x00;
@@ -235,6 +244,10 @@ static int amradio_setfreq(struct amradio_device *radio, int freq)
         int size;
         unsigned short freq_send = 0x13 + (freq >> 3) / 25;
 
+        /* safety check */
+        if (radio->removed)
+                return -EIO;
+
         mutex_lock(&radio->lock);
 
         radio->buffer[0] = 0x00;
@@ -288,18 +301,12 @@ static void usb_amradio_disconnect(struct usb_interface *intf)
 {
         struct amradio_device *radio = usb_get_intfdata(intf);
 
-        usb_set_intfdata(intf, NULL);
+        mutex_lock(&radio->lock);
+        radio->removed = 1;
+        mutex_unlock(&radio->lock);
 
-        if (radio) {
-                video_unregister_device(radio->videodev);
-                radio->videodev = NULL;
-                if (radio->users) {
-                        kfree(radio->buffer);
-                        kfree(radio);
-                } else {
-                        radio->removed = 1;
-                }
-        }
+        usb_set_intfdata(intf, NULL);
+        video_unregister_device(radio->videodev);
 }
 
 /* vidioc_querycap - query device capabilities */
@@ -320,6 +327,10 @@ static int vidioc_g_tuner(struct file *file, void *priv,
 {
         struct amradio_device *radio = video_get_drvdata(video_devdata(file));
 
+        /* safety check */
+        if (radio->removed)
+                return -EIO;
+
         if (v->index > 0)
                 return -EINVAL;
 
@@ -346,6 +357,12 @@ static int vidioc_g_tuner(struct file *file, void *priv,
 static int vidioc_s_tuner(struct file *file, void *priv,
                                 struct v4l2_tuner *v)
 {
+        struct amradio_device *radio = video_get_drvdata(video_devdata(file));
+
+        /* safety check */
+        if (radio->removed)
+                return -EIO;
+
         if (v->index > 0)
                 return -EINVAL;
         return 0;
@@ -357,9 +374,14 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct amradio_device *radio = video_get_drvdata(video_devdata(file));
 
+        /* safety check */
+        if (radio->removed)
+                return -EIO;
+
         radio->curfreq = f->frequency;
         if (amradio_setfreq(radio, radio->curfreq) < 0)
-                warn("Set frequency failed");
+                amradio_dev_warn(&radio->videodev->dev,
+                        "set frequency failed\n");
         return 0;
 }
 
@@ -369,6 +391,10 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct amradio_device *radio = video_get_drvdata(video_devdata(file));
 
+        /* safety check */
+        if (radio->removed)
+                return -EIO;
+
         f->type = V4L2_TUNER_RADIO;
         f->frequency = radio->curfreq;
         return 0;
@@ -382,8 +408,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 
         for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
                 if (qc->id && qc->id == radio_qctrl[i].id) {
-                        memcpy(qc, &(radio_qctrl[i]),
-                                                sizeof(*qc));
+                        memcpy(qc, &(radio_qctrl[i]), sizeof(*qc));
                         return 0;
                 }
         }
@@ -396,6 +421,10 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 {
         struct amradio_device *radio = video_get_drvdata(video_devdata(file));
 
+        /* safety check */
+        if (radio->removed)
+                return -EIO;
+
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
                 ctrl->value = radio->muted;
@@ -410,16 +439,22 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
 {
         struct amradio_device *radio = video_get_drvdata(video_devdata(file));
 
+        /* safety check */
+        if (radio->removed)
+                return -EIO;
+
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
                 if (ctrl->value) {
                         if (amradio_stop(radio) < 0) {
-                                warn("amradio_stop() failed");
+                                amradio_dev_warn(&radio->videodev->dev,
+                                        "amradio_stop failed\n");
                                 return -1;
                         }
                 } else {
                         if (amradio_start(radio) < 0) {
-                                warn("amradio_start() failed");
+                                amradio_dev_warn(&radio->videodev->dev,
+                                        "amradio_start failed\n");
                                 return -1;
                         }
                 }
@@ -475,30 +510,38 @@ static int usb_amradio_open(struct inode *inode, struct file *file)
         radio->muted = 1;
 
         if (amradio_start(radio) < 0) {
-                warn("Radio did not start up properly");
+                amradio_dev_warn(&radio->videodev->dev,
+                        "radio did not start up properly\n");
                 radio->users = 0;
                 unlock_kernel();
                 return -EIO;
         }
         if (amradio_setfreq(radio, radio->curfreq) < 0)
-                warn("Set frequency failed");
+                amradio_dev_warn(&radio->videodev->dev,
+                        "set frequency failed\n");
 
         unlock_kernel();
         return 0;
 }
 
-/*close device - free driver structures */
+/*close device */
 static int usb_amradio_close(struct inode *inode, struct file *file)
 {
         struct amradio_device *radio = video_get_drvdata(video_devdata(file));
+        int retval;
 
         if (!radio)
                 return -ENODEV;
+
         radio->users = 0;
-        if (radio->removed) {
-                kfree(radio->buffer);
-                kfree(radio);
+
+        if (!radio->removed) {
+                retval = amradio_stop(radio);
+                if (retval < 0)
+                        amradio_dev_warn(&radio->videodev->dev,
+                                "amradio_stop failed\n");
         }
+
         return 0;
 }
 
@@ -508,9 +551,9 @@ static int usb_amradio_suspend(struct usb_interface *intf, pm_message_t message)
         struct amradio_device *radio = usb_get_intfdata(intf);
 
         if (amradio_stop(radio) < 0)
-                warn("amradio_stop() failed");
+                dev_warn(&intf->dev, "amradio_stop failed\n");
 
-        info("radio-mr800: Going into suspend..");
+        dev_info(&intf->dev, "going into suspend..\n");
 
         return 0;
 }
@@ -521,9 +564,9 @@ static int usb_amradio_resume(struct usb_interface *intf)
         struct amradio_device *radio = usb_get_intfdata(intf);
 
         if (amradio_start(radio) < 0)
-                warn("amradio_start() failed");
+                dev_warn(&intf->dev, "amradio_start failed\n");
 
-        info("radio-mr800: Coming out of suspend..");
+        dev_info(&intf->dev, "coming out of suspend..\n");
 
         return 0;
 }
@@ -555,12 +598,24 @@ static const struct v4l2_ioctl_ops usb_amradio_ioctl_ops = {
         .vidioc_s_input     = vidioc_s_input,
 };
 
+static void usb_amradio_device_release(struct video_device *videodev)
+{
+        struct amradio_device *radio = video_get_drvdata(videodev);
+
+        /* we call v4l to free radio->videodev */
+        video_device_release(videodev);
+
+        /* free rest memory */
+        kfree(radio->buffer);
+        kfree(radio);
+}
+
 /* V4L2 interface */
 static struct video_device amradio_videodev_template = {
         .name           = "AverMedia MR 800 USB FM Radio",
         .fops           = &usb_amradio_fops,
         .ioctl_ops      = &usb_amradio_ioctl_ops,
-        .release        = video_device_release,
+        .release        = usb_amradio_device_release,
 };
 
 /* check if the device is present and register with v4l and
@@ -602,7 +657,7 @@ static int usb_amradio_probe(struct usb_interface *intf,
 
         video_set_drvdata(radio->videodev, radio);
         if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr)) {
-                warn("Could not register video device");
+                dev_warn(&intf->dev, "could not register video device\n");
                 video_device_release(radio->videodev);
                 kfree(radio->buffer);
                 kfree(radio);
@@ -617,9 +672,13 @@ static int __init amradio_init(void)
 {
         int retval = usb_register(&usb_amradio_driver);
 
-        info(DRIVER_VERSION " " DRIVER_DESC);
+        pr_info(KBUILD_MODNAME
+                ": version " DRIVER_VERSION " " DRIVER_DESC "\n");
+
         if (retval)
-                err("usb_register failed. Error number %d", retval);
+                pr_err(KBUILD_MODNAME
+                        ": usb_register failed. Error number %d\n", retval);
+
         return retval;
 }
 
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index a67079777419..7704f243b6f0 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -1,7 +1,7 @@
 /* RadioTrack II driver for Linux radio support (C) 1998 Ben Pfaff
  *
  * Based on RadioTrack I/RadioReveal (C) 1997 M. Kirkwood
- * Converted to new API by Alan Cox <Alan.Cox@linux.org>
+ * Converted to new API by Alan Cox <alan@lxorguk.ukuu.org.uk>
  * Various bugfixes and enhancements by Russell Kroll <rkroll@exploits.org>
  *
  * TODO: Allow for more than one of these foolish entities :-)
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 329c90bddadd..834d43651c70 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -3,7 +3,7 @@
  * (c) 1997 M. Kirkwood
  * (c) 1998 Petr Vandrovec, vandrove@vc.cvut.cz
  *
- * Fitted to new interface by Alan Cox <alan.cox@linux.org>
+ * Fitted to new interface by Alan Cox <alan@lxorguk.ukuu.org.uk>
  * Made working and cleaned up functions <mikael.hedin@irf.se>
  * Support for ISAPnP by Ladislav Michl <ladis@psi.cz>
  *