From 5cd48101936c9d933d04bee8a00ae9940258d3bd Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Wed, 23 Sep 2009 18:16:38 -0300 Subject: [PATCH] --- yaml --- r: 173894 b: refs/heads/master c: 30dd4508b97155a3f826f877d5750d8888bc3183 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/radio/radio-mr800.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c6b7df36157d..b4abe1331bdc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 502d50166cdef6cc8f63ab8c6ab35694ee39f608 +refs/heads/master: 30dd4508b97155a3f826f877d5750d8888bc3183 diff --git a/trunk/drivers/media/radio/radio-mr800.c b/trunk/drivers/media/radio/radio-mr800.c index 7db992d3b0db..9764eca2c498 100644 --- a/trunk/drivers/media/radio/radio-mr800.c +++ b/trunk/drivers/media/radio/radio-mr800.c @@ -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; }