2 files changed, 42 insertions, 25 deletions

diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 78f56944e640..a5ca176a7b08 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -171,11 +171,11 @@ 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 ||
+                        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)
+                        0x01, 0x00, radio->transfer_buffer, 8, 300) < 0)
                 return -1;
         radio->muted=0;
         return (radio->transfer_buffer)[0];
@@ -188,11 +188,11 @@ 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 ||
+                        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)
+                        0x00, 0x00, radio->transfer_buffer, 8, 300) < 0)
                 return -1;
         radio->muted=1;
         return (radio->transfer_buffer)[0];
@@ -201,24 +201,24 @@ static int dsbr100_stop(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, int freq)
 {
-        freq = (freq/16*80)/1000+856;
+        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 ||
+                        (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 ||
+                        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) {
+                        0x00, 0x24, radio->transfer_buffer, 8, 300) < 0) {
                 radio->stereo = -1;
                 return -1;
         }
-        radio->stereo = ! ((radio->transfer_buffer)[0]&0x01);
+        radio->stereo = !((radio->transfer_buffer)[0] & 0x01);
         return (radio->transfer_buffer)[0];
 }
 
@@ -229,10 +229,10 @@ static void dsbr100_getstat(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 , 0x24, radio->transfer_buffer, 8, 300)<0)
+                0x00 , 0x24, radio->transfer_buffer, 8, 300) < 0)
                 radio->stereo = -1;
         else
-                radio->stereo = ! (radio->transfer_buffer[0]&0x01);
+                radio->stereo = !(radio->transfer_buffer[0] & 0x01);
 }
 
 
@@ -265,7 +265,7 @@ 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));
-        sprintf(v->bus_info, "ISA");
+        sprintf(v->bus_info, "USB");
         v->version = RADIO_VERSION;
         v->capabilities = V4L2_CAP_TUNER;
         return 0;
@@ -282,9 +282,9 @@ static int vidioc_g_tuner(struct file *file, void *priv,
         dsbr100_getstat(radio);
         strcpy(v->name, "FM");
         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->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->audmode = V4L2_TUNER_MODE_STEREO;
@@ -309,7 +309,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
         struct dsbr100_device *radio = video_drvdata(file);
 
         radio->curfreq = f->frequency;
-        if (dsbr100_setfreq(radio, radio->curfreq)==-1)
+        if (dsbr100_setfreq(radio, radio->curfreq) == -1)
                 dev_warn(&radio->usbdev->dev, "Set frequency failed\n");
         return 0;
 }
@@ -331,8 +331,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;
                 }
         }
@@ -412,19 +411,25 @@ static int vidioc_s_audio(struct file *file, void *priv,
 static int usb_dsbr100_open(struct inode *inode, struct file *file)
 {
         struct dsbr100_device *radio = video_drvdata(file);
+        int retval;
 
         lock_kernel();
         radio->users = 1;
         radio->muted = 1;
 
-        if (dsbr100_start(radio)<0) {
+        if (dsbr100_start(radio) < 0) {
                 dev_warn(&radio->usbdev->dev,
                          "Radio did not start up properly\n");
                 radio->users = 0;
                 unlock_kernel();
                 return -EIO;
         }
-        dsbr100_setfreq(radio, radio->curfreq);
+
+        retval = dsbr100_setfreq(radio, radio->curfreq);
+
+        if (retval == -1)
+                printk(KERN_WARNING KBUILD_MODNAME ": Set frequency failed\n");
+
         unlock_kernel();
         return 0;
 }
@@ -485,13 +490,20 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
 {
         struct dsbr100_device *radio;
 
-        if (!(radio = kmalloc(sizeof(struct dsbr100_device), GFP_KERNEL)))
+        radio = kmalloc(sizeof(struct dsbr100_device), GFP_KERNEL);
+
+        if (!radio)
                 return -ENOMEM;
-        if (!(radio->transfer_buffer = kmalloc(TB_LEN, GFP_KERNEL))) {
+
+        radio->transfer_buffer = kmalloc(TB_LEN, GFP_KERNEL);
+
+        if (!(radio->transfer_buffer)) {
                 kfree(radio);
                 return -ENOMEM;
         }
-        if (!(radio->videodev = video_device_alloc())) {
+        radio->videodev = video_device_alloc();
+
+        if (!(radio->videodev)) {
                 kfree(radio->transfer_buffer);
                 kfree(radio);
                 return -ENOMEM;
@@ -501,7 +513,7 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
         radio->removed = 0;
         radio->users = 0;
         radio->usbdev = interface_to_usbdev(intf);
-        radio->curfreq = FREQ_MIN*FREQ_MUL;
+        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");
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index a33717c48003..256cbeffdcb6 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -469,16 +469,21 @@ static int usb_amradio_open(struct inode *inode, struct file *file)
 {
         struct amradio_device *radio = video_get_drvdata(video_devdata(file));
 
+        lock_kernel();
+
         radio->users = 1;
         radio->muted = 1;
 
         if (amradio_start(radio) < 0) {
                 warn("Radio did not start up properly");
                 radio->users = 0;
+                unlock_kernel();
                 return -EIO;
         }
         if (amradio_setfreq(radio, radio->curfreq) < 0)
                 warn("Set frequency failed");
+
+        unlock_kernel();
         return 0;
 }