Skip to contentSkip to conversation

radio-mr800: remove device initialization from open/close

PATCH In review David Ellingsworth 1 participant 1 message Sep 13, 2009

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

David Ellingsworth

author
#0 lore raw

PATCH 9/14 radio-mr800: remove device initialization from open/close

From 8c441616f67011244cb15bc1a3dda6fd8706ecd2 Mon Sep 17 00:00:00 2001
From: David Ellingsworth <[email protected]>
Date: Sat, 12 Sep 2009 16:04:44 -0400
Subject: [PATCH 08/14] mr800: fix potential use after free

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

---
drivers/media/radio/radio-mr800.c | 1 -

1 files changed, 0 insertions(+), 1 deletions(-)
drivers/media/radio/radio-mr800.c +0 -1
index 9fd2342..87b58e3 100644
@@ -274,7 +274,6 @@ static void usb_amradio_disconnect(struct usb_interface *intf)
 
    usb_set_intfdata(intf, NULL);
    video_unregister_device(&radio->videodev);
-    v4l2_device_disconnect(&radio->v4l2_dev);

}

/* vidioc_querycap - query device capabilities */

Signature · 1 line
1.6.3.3
Quoted 1 line

From 5d01d49c78e2788dca8981af7369c799b650c706 Mon Sep 17 00:00:00 2001

From: David Ellingsworth <[email protected]>
Date: Sat, 12 Sep 2009 16:28:45 -0400
Subject: [PATCH 09/14] mr800: remove device initialization from open/close

Device initialization should happen on an as needed basis. This change allows the device to continue operating even when there are no applications using it. This should allow simple command based applications to turn the device on and off without a persistent process.

Signed-off-by David Ellingsworth <[email protected]>
---
 drivers/media/radio/radio-mr800.c |   35 ++---------------------------------
 1 files changed, 2 insertions(+), 33 deletions(-)
drivers/media/radio/radio-mr800.c +2 -33
index 87b58e3..df020e8 100644
@@ -136,7 +136,6 @@ struct amradio_device {
 	struct mutex lock;	/* buffer locking */
 	int curfreq;
 	int stereo;
-	int users;
 	int muted;
 };
 

@@ -492,26 +491,6 @@ 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;
-	}
-
-	retval = amradio_set_stereo(radio, WANT_STEREO);
-	if (retval < 0)
-		amradio_dev_warn(&radio->videodev.dev,
-			"set stereo failed\n");
-
-	retval = amradio_setfreq(radio, radio->curfreq);
-	if (retval < 0)
-		amradio_dev_warn(&radio->videodev.dev,
-			"set frequency failed\n");
 
 unlock:
 	mutex_unlock(&radio->lock);

@@ -526,19 +505,9 @@ static int usb_amradio_close(struct file *file)
 
 	mutex_lock(&radio->lock);
 
-	if (!radio->usbdev) {
+	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");
-
-unlock:
 	mutex_unlock(&radio->lock);
 	return retval;
 }

@@ -669,10 +638,10 @@ static int usb_amradio_probe(struct usb_interface *intf,
 	radio->videodev.ioctl_ops = &usb_amradio_ioctl_ops;
 	radio->videodev.release = usb_amradio_video_device_release;
 
-	radio->users = 0;
 	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