Skip to contentSkip to conversation

radio-mr800: turn radio on during first open and off during last close

PATCH In review David Ellingsworth 1 participant 2 messages Sep 12, 2009

Subsystems (2)
Media (V4L/DVB) MR800 avermedia USB FM radio driver
lore
Share & tools
lore

David Ellingsworth

author
#0 lore raw

PATCH 8/10 radio-mr800: turn radio on during first open and off during last close

From 46c7d395e4ed2df431b21b6c07fb02a075a15e43 Mon Sep 17 00:00:00 2001
From: David Ellingsworth <[email protected]>
Date: Sat, 12 Sep 2009 01:57:36 -0400
Subject: [PATCH 08/10] mr800: turn radio on during first open and off during last close

Signed-off-by David Ellingsworth <[email protected]>

---
drivers/media/radio/radio-mr800.c | 31 +++++++++++++++++--------------

1 files changed, 17 insertions(+), 14 deletions(-)
drivers/media/radio/radio-mr800.c +9 -8
index 9fd2342..11db6ea 100644
@@ -493,15 +493,14 @@ static int usb_amradio_open(struct file *file)
    }
 
    file->private_data = radio;
-    radio->users = 1;
-    radio->muted = 1;
 
-    retval = amradio_set_mute(radio, AMRADIO_START);
-    if (retval < 0) {
-        amradio_dev_warn(&radio->videodev.dev,
-            "radio did not start up properly\n");
-        radio->users = 0;
-        goto unlock;
+    if (radio->users == 0) {
+        retval = amradio_set_mute(radio, AMRADIO_START);
+        if (retval < 0) {
+            amradio_dev_warn(&radio->videodev.dev,
+                "radio did not start up properly\n");
+            goto unlock;
+        }
    }
 
    retval = amradio_set_stereo(radio, WANT_STEREO);

@@ -514,6 +513,8 @@ static int usb_amradio_open(struct file *file)
        amradio_dev_warn(&radio->videodev.dev,
            "set frequency failed\n");
 
+    radio->users++;
+

unlock:

    mutex_unlock(&radio->lock);
    return retval;
@@ -526,18 +527,19 @@ static int usb_amradio_close(struct file *file)
    int retval = 0;

    mutex_lock(&radio->lock);

+ radio->users--;

    if (!radio->usbdev) {
        retval = -EIO;
        goto unlock;
    }

- radio->users = 0;
-
- retval = amradio_set_mute(radio, AMRADIO_STOP);
- if (retval < 0)
- amradio_dev_warn(&radio->videodev.dev,
- "amradio_stop failed\n");
+ if (radio->users == 0 && !radio->muted) {
+ retval = amradio_set_mute(radio, AMRADIO_STOP);
+ if (retval < 0)
+ amradio_dev_warn(&radio->videodev.dev,
+ "amradio_stop failed\n");
+ }

unlock:

    mutex_unlock(&radio->lock);
@@ -674,6 +676,7 @@ static int usb_amradio_probe(struct usb_interface *intf,
    radio->usbdev = interface_to_usbdev(intf);
    radio->curfreq = 95.16 * FREQ_MUL;
    radio->stereo = -1;

+ radio->muted = 1;

    mutex_init(&radio->lock);
Signature · 1 line
1.6.3.3
Quoted 1 line

From 46c7d395e4ed2df431b21b6c07fb02a075a15e43 Mon Sep 17 00:00:00 2001

From: David Ellingsworth <[email protected]>
Date: Sat, 12 Sep 2009 01:57:36 -0400
Subject: [PATCH 08/10] mr800: turn radio on during first open and off during last close

Signed-off-by David Ellingsworth <[email protected]>
---
 drivers/media/radio/radio-mr800.c |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)
drivers/media/radio/radio-mr800.c +17 -14
index 9fd2342..11db6ea 100644
@@ -493,15 +493,14 @@ static int usb_amradio_open(struct file *file)
 	}
 
 	file->private_data = radio;
-	radio->users = 1;
-	radio->muted = 1;
 
-	retval = amradio_set_mute(radio, AMRADIO_START);
-	if (retval < 0) {
-		amradio_dev_warn(&radio->videodev.dev,
-			"radio did not start up properly\n");
-		radio->users = 0;
-		goto unlock;
+	if (radio->users == 0) {
+		retval = amradio_set_mute(radio, AMRADIO_START);
+		if (retval < 0) {
+			amradio_dev_warn(&radio->videodev.dev,
+				"radio did not start up properly\n");
+			goto unlock;
+		}
 	}
 
 	retval = amradio_set_stereo(radio, WANT_STEREO);

@@ -514,6 +513,8 @@ static int usb_amradio_open(struct file *file)
 		amradio_dev_warn(&radio->videodev.dev,
 			"set frequency failed\n");
 
+	radio->users++;
+
 unlock:
 	mutex_unlock(&radio->lock);
 	return retval;

@@ -526,18 +527,19 @@ static int usb_amradio_close(struct file *file)
 	int retval = 0;
 
 	mutex_lock(&radio->lock);
+	radio->users--;
 
 	if (!radio->usbdev) {
 		retval = -EIO;
 		goto unlock;
 	}
 
-	radio->users = 0;
-
-	retval = amradio_set_mute(radio, AMRADIO_STOP);
-	if (retval < 0)
-		amradio_dev_warn(&radio->videodev.dev,
-			"amradio_stop failed\n");
+	if (radio->users == 0 && !radio->muted) {
+		retval = amradio_set_mute(radio, AMRADIO_STOP);
+		if (retval < 0)
+			amradio_dev_warn(&radio->videodev.dev,
+				"amradio_stop failed\n");
+	}
 
 unlock:
 	mutex_unlock(&radio->lock);

@@ -674,6 +676,7 @@ static int usb_amradio_probe(struct usb_interface *intf,
 	radio->usbdev = interface_to_usbdev(intf);
 	radio->curfreq = 95.16 * FREQ_MUL;
 	radio->stereo = -1;
+	radio->muted = 1;
 
 	mutex_init(&radio->lock);
Signature · 1 line
1.6.3.3
author
#1 lore raw
Quoted 83 lines · David Ellingsworth

From 46c7d395e4ed2df431b21b6c07fb02a075a15e43 Mon Sep 17 00:00:00 2001
From: David Ellingsworth <[email protected]>
Date: Sat, 12 Sep 2009 01:57:36 -0400
Subject: [PATCH 08/10] mr800: turn radio on during first open and off during last close

Signed-off-by David Ellingsworth <[email protected]>

---
drivers/media/radio/radio-mr800.c |   31 +++++++++++++++++--------------

1 files changed, 17 insertions(+), 14 deletions(-)
drivers/media/radio/radio-mr800.c +9 -8
index 9fd2342..11db6ea 100644
@@ -493,15 +493,14 @@ static int usb_amradio_open(struct file *file)
    }
 
    file->private_data = radio;
-    radio->users = 1;
-    radio->muted = 1;
 
-    retval = amradio_set_mute(radio, AMRADIO_START);
-    if (retval < 0) {
-        amradio_dev_warn(&radio->videodev.dev,
-            "radio did not start up properly\n");
-        radio->users = 0;
-        goto unlock;
+    if (radio->users == 0) {
+        retval = amradio_set_mute(radio, AMRADIO_START);
+        if (retval < 0) {
+            amradio_dev_warn(&radio->videodev.dev,
+                "radio did not start up properly\n");
+            goto unlock;
+        }
    }
 
    retval = amradio_set_stereo(radio, WANT_STEREO);

@@ -514,6 +513,8 @@ static int usb_amradio_open(struct file *file)
        amradio_dev_warn(&radio->videodev.dev,
            "set frequency failed\n");
 
+    radio->users++;
+

unlock:
   mutex_unlock(&radio->lock);
   return retval;

drivers/media/radio/radio-mr800.c +7 -6
@@ -526,18 +527,19 @@ static int usb_amradio_close(struct file *file)
    int retval = 0;
 
    mutex_lock(&radio->lock);
+    radio->users--;
 
    if (!radio->usbdev) {
        retval = -EIO;
        goto unlock;
    }
 
-    radio->users = 0;
-
-    retval = amradio_set_mute(radio, AMRADIO_STOP);
-    if (retval < 0)
-        amradio_dev_warn(&radio->videodev.dev,
-            "amradio_stop failed\n");
+    if (radio->users == 0 && !radio->muted) {
+        retval = amradio_set_mute(radio, AMRADIO_STOP);
+        if (retval < 0)
+            amradio_dev_warn(&radio->videodev.dev,
+                "amradio_stop failed\n");
+    }

unlock:
   mutex_unlock(&radio->lock);

drivers/media/radio/radio-mr800.c +1 -1
@@ -674,6 +676,7 @@ static int usb_amradio_probe(struct usb_interface *intf,
    radio->usbdev = interface_to_usbdev(intf);
    radio->curfreq = 95.16 * FREQ_MUL;
    radio->stereo = -1;
+    radio->muted = 1;
 
    mutex_init(&radio->lock);
 
--
Quoted 3 lines

1.6.3.3

I just went back over Alexey Klimov's last patch series and I think I'm going to rework this patch. I agree with the concept he presented in his last patch whereby the radio should not be turned on/off during open close, nor should the device's frequency or stereo be set.

Regards,

David Ellingsworth