1 files changed, 34 insertions, 17 deletions

diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index 51d57ed3b3e1..15b10bad6796 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -69,6 +69,7 @@ static int io = CONFIG_RADIO_ZOLTRIX_PORT;
 static int radio_nr = -1;
 
 struct zol_device {
+        unsigned long in_use;
         int port;
         int curvol;
         unsigned long curfreq;
@@ -122,8 +123,11 @@ static int zol_setfreq(struct zol_device *dev, unsigned long freq)
         unsigned int stereo = dev->stereo;
         int i;
 
-        if (freq == 0)
-                return 1;
+        if (freq == 0) {
+                printk(KERN_WARNING "zoltrix: received zero freq. Failed to set.\n");
+                return -EINVAL;
+        }
+
         m = (freq / 160 - 8800) * 2;
         f = (unsigned long long) m + 0x4d1c;
 
@@ -245,8 +249,7 @@ static int vidioc_querycap(struct file *file, void  *priv,
 static int vidioc_g_tuner(struct file *file, void *priv,
                                         struct v4l2_tuner *v)
 {
-        struct video_device *dev = video_devdata(file);
-        struct zol_device *zol = dev->priv;
+        struct zol_device *zol = video_drvdata(file);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -276,19 +279,20 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 static int vidioc_s_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct zol_device *zol = dev->priv;
+        struct zol_device *zol = video_drvdata(file);
 
         zol->curfreq = f->frequency;
-        zol_setfreq(zol, zol->curfreq);
+        if (zol_setfreq(zol, zol->curfreq) != 0) {
+                printk(KERN_WARNING "zoltrix: Set frequency failed.\n");
+                return -EINVAL;
+        }
         return 0;
 }
 
 static int vidioc_g_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct zol_device *zol = dev->priv;
+        struct zol_device *zol = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = zol->curfreq;
@@ -313,8 +317,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct zol_device *zol = dev->priv;
+        struct zol_device *zol = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -330,8 +333,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl(struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct zol_device *zol = dev->priv;
+        struct zol_device *zol = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -347,7 +349,10 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
                 return 0;
         }
         zol->stereo = 1;
-        zol_setfreq(zol, zol->curfreq);
+        if (zol_setfreq(zol, zol->curfreq) != 0) {
+                printk(KERN_WARNING "zoltrix: Set frequency failed.\n");
+                return -EINVAL;
+        }
 #if 0
 /* FIXME: Implement stereo/mono switch on V4L2 */
                         if (v->mode & VIDEO_SOUND_STEREO) {
@@ -396,11 +401,22 @@ static int vidioc_s_audio(struct file *file, void *priv,
 
 static struct zol_device zoltrix_unit;
 
+static int zoltrix_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &zoltrix_unit.in_use) ? -EBUSY : 0;
+}
+
+static int zoltrix_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &zoltrix_unit.in_use);
+        return 0;
+}
+
 static const struct file_operations zoltrix_fops =
 {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = zoltrix_exclusive_open,
+        .release        = zoltrix_exclusive_release,
         .ioctl          = video_ioctl2,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -427,6 +443,7 @@ static struct video_device zoltrix_radio = {
         .name           = "Zoltrix Radio Plus",
         .fops           = &zoltrix_fops,
         .ioctl_ops      = &zoltrix_ioctl_ops,
+        .release        = video_device_release_empty,
 };
 
 static int __init zoltrix_init(void)
@@ -440,7 +457,7 @@ static int __init zoltrix_init(void)
                 return -ENXIO;
         }
 
-        zoltrix_radio.priv = &zoltrix_unit;
+        video_set_drvdata(&zoltrix_radio, &zoltrix_unit);
         if (!request_region(io, 2, "zoltrix")) {
                 printk(KERN_ERR "zoltrix: port 0x%x already in use\n", io);
                 return -EBUSY;