V4L/DVB (13069): radio-mr800: ensure the radio is initialized to a consistent state
Ensure the radio is initialized to a consistent state.
Signed-off-by: David Ellingsworth <david@identd.dyndns.org>
Acked-by: Alexey Klimov <klimov.linux@gmail.com>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index 399032e..7db992d 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -85,6 +85,9 @@
#define amradio_dev_warn(dev, fmt, arg...) \
dev_warn(dev, MR800_DRIVER_NAME " - " fmt, ##arg)
+#define amradio_dev_err(dev, fmt, arg...) \
+ dev_err(dev, MR800_DRIVER_NAME " - " fmt, ##arg)
+
/* Probably USB_TIMEOUT should be modified in module parameter */
#define BUFFER_LENGTH 8
#define USB_TIMEOUT 500
@@ -137,6 +140,7 @@
int curfreq;
int stereo;
int muted;
+ int initialized;
};
#define vdev_to_amradio(r) container_of(r, struct amradio_device, videodev)
@@ -478,6 +482,31 @@
return 0;
}
+static int usb_amradio_init(struct amradio_device *radio)
+{
+ int retval;
+
+ retval = amradio_set_mute(radio, AMRADIO_STOP);
+ if (retval < 0) {
+ amradio_dev_warn(&radio->videodev.dev, "amradio_stop failed\n");
+ goto out_err;
+ }
+
+ retval = amradio_set_stereo(radio, WANT_STEREO);
+ if (retval < 0) {
+ amradio_dev_warn(&radio->videodev.dev, "set stereo failed\n");
+ goto out_err;
+ }
+
+ radio->initialized = 1;
+ goto out;
+
+out_err:
+ amradio_dev_err(&radio->videodev.dev, "initialization failed\n");
+out:
+ return retval;
+}
+
/* open device - amradio_start() and amradio_setfreq() */
static int usb_amradio_open(struct file *file)
{
@@ -493,6 +522,9 @@
file->private_data = radio;
+ if (unlikely(!radio->initialized))
+ retval = usb_amradio_init(radio);
+
unlock:
mutex_unlock(&radio->lock);
return retval;
@@ -641,8 +673,6 @@
radio->usbdev = interface_to_usbdev(intf);
radio->curfreq = 95.16 * FREQ_MUL;
- radio->stereo = -1;
- radio->muted = 1;
mutex_init(&radio->lock);