Skip to contentSkip to conversation

radio-mr800: fix behavior of set_stereo function

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 11/14 radio-mr800: fix behavior of set_stereo function

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 ea0c11ec6706fbd0777b0147da8a8a827a537699 Mon Sep 17 00:00:00 2001

From: David Ellingsworth <[email protected]>
Date: Sat, 12 Sep 2009 22:00:29 -0400
Subject: [PATCH 11/14] mr800: fix behavior of set_stereo function

Signed-off-by David Ellingsworth <[email protected]>
---
 drivers/media/radio/radio-mr800.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
drivers/media/radio/radio-mr800.c +5 -4
index dbf0dbb..8fc413d 100644
@@ -252,12 +252,13 @@ static int amradio_set_stereo(struct amradio_device *radio, char argument)
 	retval = usb_bulk_msg(radio->usbdev, usb_sndintpipe(radio->usbdev, 2),
 		(void *) (radio->buffer), BUFFER_LENGTH, &size, USB_TIMEOUT);
 
-	if (retval < 0 || size != BUFFER_LENGTH) {
-		radio->stereo = -1;
+	if (retval < 0 || size != BUFFER_LENGTH)
 		return retval;
-	}
 
-	radio->stereo = 1;
+	if (argument == WANT_STEREO)
+		radio->stereo = 1;
+	else
+		radio->stereo = 0;
 
 	return retval;
 }
Signature · 1 line
1.6.3.3